egl/drm: move teardown code to the platform file
Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
This commit is contained in:
committed by
Emil Velikov
parent
938fcab08b
commit
40a01c9a0e
@@ -991,13 +991,9 @@ dri2_display_destroy(_EGLDisplay *disp)
|
|||||||
case _EGL_PLATFORM_X11:
|
case _EGL_PLATFORM_X11:
|
||||||
dri2_teardown_x11(dri2_dpy);
|
dri2_teardown_x11(dri2_dpy);
|
||||||
break;
|
break;
|
||||||
#ifdef HAVE_DRM_PLATFORM
|
|
||||||
case _EGL_PLATFORM_DRM:
|
case _EGL_PLATFORM_DRM:
|
||||||
if (dri2_dpy->own_device) {
|
dri2_teardown_drm(disp);
|
||||||
gbm_device_destroy(&dri2_dpy->gbm_dri->base);
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
#endif
|
|
||||||
#ifdef HAVE_WAYLAND_PLATFORM
|
#ifdef HAVE_WAYLAND_PLATFORM
|
||||||
case _EGL_PLATFORM_WAYLAND:
|
case _EGL_PLATFORM_WAYLAND:
|
||||||
if (dri2_dpy->wl_drm)
|
if (dri2_dpy->wl_drm)
|
||||||
|
|||||||
@@ -418,12 +418,16 @@ dri2_teardown_x11(struct dri2_egl_display *dri2_dpy) {}
|
|||||||
#ifdef HAVE_DRM_PLATFORM
|
#ifdef HAVE_DRM_PLATFORM
|
||||||
EGLBoolean
|
EGLBoolean
|
||||||
dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp);
|
dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp);
|
||||||
|
void
|
||||||
|
dri2_teardown_drm(struct dri2_egl_display *dri2_dpy);
|
||||||
#else
|
#else
|
||||||
static inline EGLBoolean
|
static inline EGLBoolean
|
||||||
dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp)
|
dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp)
|
||||||
{
|
{
|
||||||
return _eglError(EGL_NOT_INITIALIZED, "GBM/DRM platform not built");
|
return _eglError(EGL_NOT_INITIALIZED, "GBM/DRM platform not built");
|
||||||
}
|
}
|
||||||
|
static inline void
|
||||||
|
dri2_teardown_drm(struct dri2_egl_display *dri2_dpy) {}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_WAYLAND_PLATFORM
|
#ifdef HAVE_WAYLAND_PLATFORM
|
||||||
|
|||||||
@@ -741,3 +741,10 @@ cleanup:
|
|||||||
dri2_display_destroy(disp);
|
dri2_display_destroy(disp);
|
||||||
return _eglError(EGL_NOT_INITIALIZED, err);
|
return _eglError(EGL_NOT_INITIALIZED, err);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
dri2_teardown_drm(struct dri2_egl_display *dri2_dpy)
|
||||||
|
{
|
||||||
|
if (dri2_dpy->own_device)
|
||||||
|
gbm_device_destroy(&dri2_dpy->gbm_dri->base);
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user