fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

egl/dri2: only destroy created objects

Browse source 
dri2_display_destroy may be called by dri2_initialize_wayland_drm() if
initialization fails. In this case, these objects may not be initialized.

Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit 81d5c31631)
[Andres Gomez: resolve trivial conflicts]
Signed-off-by: Andres Gomez <agomez@igalia.com>

Conflicts:
	src/egl/drivers/dri2/egl_dri2.c
This commit is contained in:
Michael Olbrich 2017-08-29 11:51:20 +02:00 • committed by Andres Gomez
parent edbb6d405c
commit 52e70819b4
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/egl/drivers/dri2/egl_dri2.c
View file

@ -936,9 +936,12 @@ dri2_display_release(_EGLDisplay *disp)
wl_drm_destroy(dri2_dpy->wl_drm); wl_drm_destroy(dri2_dpy->wl_drm);
if (dri2_dpy->wl_shm) if (dri2_dpy->wl_shm)
wl_shm_destroy(dri2_dpy->wl_shm); wl_shm_destroy(dri2_dpy->wl_shm);
wl_registry_destroy(dri2_dpy->wl_registry); if (dri2_dpy->wl_registry)
wl_event_queue_destroy(dri2_dpy->wl_queue); wl_registry_destroy(dri2_dpy->wl_registry);
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->wl_dpy_wrapper)
wl_proxy_wrapper_destroy(dri2_dpy->wl_dpy_wrapper);
if (dri2_dpy->own_device) { if (dri2_dpy->own_device) {
wl_display_disconnect(dri2_dpy->wl_dpy); wl_display_disconnect(dri2_dpy->wl_dpy);
} }