nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-22 07:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

backend/wayland: commit null buffer only on unmap

Browse Source 
If the guest compositor disabled an output and then immediately
committed another state, we would perform a commit with a null buffer,
which is against the protocol, as the host compositor expects an
initial commit with no buffer at all.
This commit is contained in:
Kirill Primak 2024-02-11 10:38:59 +03:00
parent baf1e4f674
commit d9f6498f8a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/wayland/output.c
View File

@ -548,7 +548,9 @@ static bool output_commit(struct wlr_output *wlr_output,
return false; return false;
} }
if ((state->committed & WLR_OUTPUT_STATE_ENABLED) && !state->enabled) { bool pending_enabled = output_pending_enabled(wlr_output, state);
if (wlr_output->enabled && !pending_enabled) {
wl_surface_attach(output->surface, NULL, 0, 0); wl_surface_attach(output->surface, NULL, 0, 0);
wl_surface_commit(output->surface); wl_surface_commit(output->surface);
} }
@ -575,7 +577,7 @@ static bool output_commit(struct wlr_output *wlr_output,
return false; return false;
} }
if (output_pending_enabled(wlr_output, state)) { if (pending_enabled) {
if (output->frame_callback != NULL) { if (output->frame_callback != NULL) {
wl_callback_destroy(output->frame_callback); wl_callback_destroy(output->frame_callback);
} }