diff options
author | Emil Velikov <[email protected]> | 2017-11-09 19:13:09 +0000 |
---|---|---|
committer | Emil Velikov <[email protected]> | 2017-11-16 14:03:10 +0000 |
commit | 8d745abc00903d4685ab7caa3f49573523d83049 (patch) | |
tree | 20f1ac48244d00bfbceacfab4f58b381a9cf3747 /src/egl/drivers/dri2/egl_dri2.c | |
parent | 40a01c9a0ef2c8110d79c284976ef34c0f73be92 (diff) |
egl/wayland: move teardown code to the platform file
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/egl/drivers/dri2/egl_dri2.c')
-rw-r--r-- | src/egl/drivers/dri2/egl_dri2.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index fc56e6357a6..28a3591ed49 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -994,28 +994,9 @@ dri2_display_destroy(_EGLDisplay *disp) case _EGL_PLATFORM_DRM: dri2_teardown_drm(disp); break; -#ifdef HAVE_WAYLAND_PLATFORM case _EGL_PLATFORM_WAYLAND: - if (dri2_dpy->wl_drm) - wl_drm_destroy(dri2_dpy->wl_drm); - if (dri2_dpy->wl_dmabuf) - zwp_linux_dmabuf_v1_destroy(dri2_dpy->wl_dmabuf); - if (dri2_dpy->wl_shm) - 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); - u_vector_finish(&dri2_dpy->wl_modifiers.argb8888); - u_vector_finish(&dri2_dpy->wl_modifiers.xrgb8888); - u_vector_finish(&dri2_dpy->wl_modifiers.rgb565); - if (dri2_dpy->own_device) { - wl_display_disconnect(dri2_dpy->wl_dpy); - } + dri2_teardown_wayland(disp); break; -#endif default: break; } |