mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-26 06:59:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

scene: Fix scanout log to respect SCANOUT_SUCCESS

Browse source 
scene_entry_try_direct_scanout returns a tristate value, but the log
message was not updated to account for this.

Compare whether or not the state is specifically SCANOUT_SUCCESS for
logging purposes.

Fixes: c450991c4b
This commit is contained in:
Kenny Levinsen 2025-04-14 16:52:00 +02:00
parent 867960d6f4
commit 4277d8cfdc
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
types/scene/wlr_scene.c
View file

@ -2166,13 +2166,13 @@ bool wlr_scene_output_build_state(struct wlr_scene_output *scene_output,
// - There is only one entry in the render list
// - There are no color transforms that need to be applied
// - Damage highlight debugging is not enabled
enum scene_direct_scanout_result scanout = SCANOUT_INELIGIBLE;
enum scene_direct_scanout_result scanout_result = SCANOUT_INELIGIBLE;
if (options->color_transform == NULL && list_len == 1
&& debug_damage != WLR_SCENE_DEBUG_DAMAGE_HIGHLIGHT) {
scanout = scene_entry_try_direct_scanout(&list_data[0], state, &render_data);
scanout_result = scene_entry_try_direct_scanout(&list_data[0], state, &render_data);
}
if (scanout == SCANOUT_INELIGIBLE) {
if (scanout_result == SCANOUT_INELIGIBLE) {
if (scene_output->dmabuf_feedback_debounce > 0) {
// We cannot scan out, so count down towards sending composition dmabuf feedback
scene_output->dmabuf_feedback_debounce--;
@ -2183,14 +2183,14 @@ bool wlr_scene_output_build_state(struct wlr_scene_output *scene_output,
scene_output->dmabuf_feedback_debounce++;
}
bool scanout_success = scanout == SCANOUT_SUCCESS;
bool scanout = scanout_result == SCANOUT_SUCCESS;
if (scene_output->prev_scanout != scanout) {
scene_output->prev_scanout = scanout;
wlr_log(WLR_DEBUG, "Direct scan-out %s",
scanout ? "enabled" : "disabled");
}
if (scanout_success) {
if (scanout) {
scene_output_state_attempt_gamma(scene_output, state);
if (timer) {