Module: Mesa Branch: main Commit: ee5d2250fd159689aae3f7d632a6226971bea85c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee5d2250fd159689aae3f7d632a6226971bea85c
Author: Alexandros Frantzis <[email protected]> Date: Thu Mar 2 09:35:08 2023 +0200 egl/wayland: Fix destruction of event queue with proxies still attached. Destroy the display wrapper proxy before destroying the event queue that the proxy is attached to. This silences a warning that libwayland 1.22 emits for programs that use EGL/Wayland: warning: queue 0x562a5ed2cd20 destroyed while proxies still attached: wl_display@1 still attached Signed-off-by: Alexandros Frantzis <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21646> --- src/egl/drivers/dri2/platform_wayland.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index e48777e8eb0..209a77143ec 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -2865,10 +2865,10 @@ dri2_teardown_wayland(struct dri2_egl_display *dri2_dpy) wl_shm_destroy(dri2_dpy->wl_shm); if (dri2_dpy->wl_registry) wl_registry_destroy(dri2_dpy->wl_registry); - if (dri2_dpy->wl_queue) - wl_event_queue_destroy(dri2_dpy->wl_queue); if (dri2_dpy->wl_dpy_wrapper) wl_proxy_wrapper_destroy(dri2_dpy->wl_dpy_wrapper); + if (dri2_dpy->wl_queue) + wl_event_queue_destroy(dri2_dpy->wl_queue); if (dri2_dpy->own_device) wl_display_disconnect(dri2_dpy->wl_dpy);
