mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

compositor: release current buffer after commit event

Browse source 
Some compositors may want to access the original buffer in their
commit handler.
This commit is contained in:
Simon Ser 2022-11-11 16:32:21 +01:00
parent 359df5ef84
commit 1978a91717
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
types/wlr_compositor.c
View file

@ -373,9 +373,6 @@ static void surface_apply_damage(struct wlr_surface *surface) {
struct wlr_client_buffer *buffer = wlr_client_buffer_create( struct wlr_client_buffer *buffer = wlr_client_buffer_create(
surface->current.buffer, surface->renderer); surface->current.buffer, surface->renderer);
wlr_buffer_unlock(surface->current.buffer);
surface->current.buffer = NULL;
if (buffer == NULL) { if (buffer == NULL) {
wlr_log(WLR_ERROR, "Failed to upload buffer"); wlr_log(WLR_ERROR, "Failed to upload buffer");
return; return;
@ -495,6 +492,12 @@ static void surface_commit_state(struct wlr_surface *surface,
} }
wl_signal_emit_mutable(&surface->events.commit, surface); wl_signal_emit_mutable(&surface->events.commit, surface);
// Release the buffer after emitting the commit event, so that listeners can
// access it. Don't leave the buffer locked so that wl_shm buffers can be
// released immediately on commit when they are uploaded to the GPU.
wlr_buffer_unlock(surface->current.buffer);
surface->current.buffer = NULL;
} }
static void surface_handle_commit(struct wl_client *client, static void surface_handle_commit(struct wl_client *client,