From 3e83f9d6b89f9b3a7af9761b4adffd173858e637 Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 7 Jun 2018 18:57:06 +0100 Subject: [PATCH] surface: don't release wl_drm and linux-dmabuf buffers early --- types/wlr_surface.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/types/wlr_surface.c b/types/wlr_surface.c index 9c3eb86d..fca4e847 100644 --- a/types/wlr_surface.c +++ b/types/wlr_surface.c @@ -394,6 +394,10 @@ static void surface_apply_damage(struct wlr_surface *surface, } wl_shm_buffer_end_access(buf); + + // We've uploaded the wl_shm_buffer data to the GPU, we won't access the + // wl_buffer anymore + surface_state_release_buffer(surface->current); } else if (invalid_buffer || reupload_buffer) { wlr_texture_destroy(surface->texture); @@ -409,9 +413,10 @@ static void surface_apply_damage(struct wlr_surface *surface, surface->texture = NULL; wlr_log(L_ERROR, "Unknown buffer handle attached"); } - } - surface_state_release_buffer(surface->current); + // Don't release the wl_buffer yet: since the texture is shared with the + // client, we'll access the wl_buffer when rendering + } } static void surface_commit_pending(struct wlr_surface *surface) {