From 58f90fd03f4aaf2ee19010e9cbd9cee2deda9711 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Fri, 9 Sep 2022 15:18:17 +0200 Subject: [PATCH] egl/wayland: fix glthread crashes glthread unmarshalling thread cannot run concurrently with code that alloc the back bo or the code that perform the swaps. Ensure this by running dri2_flush_drawable_for_swapbuffers early. Reviewed-by: Daniel Stone Part-of: --- src/egl/drivers/dri2/platform_wayland.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index d536bdb0f9b..93bb97c54e0 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -1527,6 +1527,17 @@ dri2_wl_swap_buffers_with_damage(_EGLDisplay *disp, if (dri2_surf->color_buffers[i].age > 0) dri2_surf->color_buffers[i].age++; + /* Flush (and finish glthread) before: + * - update_buffers_if_needed because the unmarshalling thread + * may be running currently, and we would concurrently alloc/free + * the back bo. + * - swapping current/back because flushing may free the buffer and + * dri_image and reallocate them using get_back_bo (which causes a + * a crash because 'current' becomes NULL). + */ + dri2_flush_drawable_for_swapbuffers(disp, draw); + dri2_dpy->flush->invalidate(dri2_surf->dri_drawable); + /* Make sure we have a back buffer in case we're swapping without ever * rendering. */ if (update_buffers_if_needed(dri2_surf) < 0) @@ -1589,9 +1600,6 @@ dri2_wl_swap_buffers_with_damage(_EGLDisplay *disp, dri2_surf->base.Height, 0); } - dri2_flush_drawable_for_swapbuffers(disp, draw); - dri2_dpy->flush->invalidate(dri2_surf->dri_drawable); - wl_surface_commit(dri2_surf->wl_surface_wrapper); /* If we're not waiting for a frame callback then we'll at least throttle