Module: Mesa Branch: master Commit: 1a8015e753c6f52b24a473ea60e3ce0b38de7d42 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1a8015e753c6f52b24a473ea60e3ce0b38de7d42
Author: Emil Velikov <[email protected]> Date: Sun Aug 27 11:20:28 2017 +0100 egl/wayland: polish object teardown in dri2_wl_destroy_surface The wl_drm wrapper is created before the wl display/surface ones. Thus make sure we destroy it after them. In reality it should not make any difference either way. Fixes: 03dd9a88b0b ("egl/wayland: Use per-surface event queues") Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Daniel Stone <[email protected]> --- 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 05263fe99d..754ce6c399 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -293,10 +293,10 @@ dri2_wl_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) dri2_surf->wl_win->destroy_window_callback = NULL; } - if (dri2_surf->wl_drm_wrapper) - wl_proxy_wrapper_destroy(dri2_surf->wl_drm_wrapper); wl_proxy_wrapper_destroy(dri2_surf->wl_surface_wrapper); wl_proxy_wrapper_destroy(dri2_surf->wl_dpy_wrapper); + if (dri2_surf->wl_drm_wrapper) + wl_proxy_wrapper_destroy(dri2_surf->wl_drm_wrapper); wl_event_queue_destroy(dri2_surf->wl_queue); free(surf); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
