blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

output-damage: fix damage on modeset 

On modeset wlr_output will internally allocate a buffer. The
backend will emit a "mode" output event, then wlr_output will
emit a "commit" event.

wlr_output_damage handles the "mode" event by damaging the whole
output, and then handles the "commit" event. However the commit
event has a buffer, so wlr_output_damage rotates the damage in its
ring buffer, thinking the compositor has rendered a frame. The
compositor hasn't rendered a frame, what wlr_output_damage sees is
the internal wlr_output black buffer used for the modeset.

Let's fix this by damaging the whole output in the "commit" event
handler if the mode has changed. Additionally, damage the whole
output after rotating the damage ring buffer.
This commit is contained in:
Simon Ser 2021-09-07 10:45:05 +02:00 committed by Kenny Levinsen
parent 35f0a0d570
commit 04304c322e
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
types/wlr_output_damage.c
View File

@ -61,14 +61,7 @@ static void output_handle_commit(struct wl_listener *listener, void *data) {
wl_container_of(listener, output_damage, output_commit); wl_container_of(listener, output_damage, output_commit);
struct wlr_output_event_commit *event = data; struct wlr_output_event_commit *event = data;
if (event->committed & (WLR_OUTPUT_STATE_SCALE | WLR_OUTPUT_STATE_TRANSFORM)) { if (event->committed & WLR_OUTPUT_STATE_BUFFER) {
wlr_output_damage_add_whole(output_damage);
}
if (!(event->committed & WLR_OUTPUT_STATE_BUFFER)) {
return;
}
pixman_region32_t *prev; pixman_region32_t *prev;
if (output_damage->pending_attach_render) { if (output_damage->pending_attach_render) {
// render-buffers have been swapped, rotate the damage // render-buffers have been swapped, rotate the damage
@ -86,6 +79,12 @@ static void output_handle_commit(struct wl_listener *listener, void *data) {
} }
pixman_region32_clear(&output_damage->current); pixman_region32_clear(&output_damage->current);
}
if (event->committed & (WLR_OUTPUT_STATE_MODE | WLR_OUTPUT_STATE_SCALE |
WLR_OUTPUT_STATE_TRANSFORM)) {
wlr_output_damage_add_whole(output_damage);
}
} }
struct wlr_output_damage *wlr_output_damage_create(struct wlr_output *output) { struct wlr_output_damage *wlr_output_damage_create(struct wlr_output *output) {