Mesa (master): wayland: Only pass wl_drm instance to gbm when using gbm platform
Kristian Høgsberg
krh at kemper.freedesktop.org
Fri Oct 11 22:31:00 UTC 2013
Module: Mesa
Branch: master
Commit: 1d3492706156b2caa7eb3b84125dbabc999695aa
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d3492706156b2caa7eb3b84125dbabc999695aa
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Fri Oct 11 15:30:09 2013 -0700
wayland: Only pass wl_drm instance to gbm when using gbm platform
---
src/egl/drivers/dri2/egl_dri2.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 18ecdc8..1089616 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1855,7 +1855,8 @@ dri2_bind_wayland_display_wl(_EGLDriver *drv, _EGLDisplay *disp,
/* We have to share the wl_drm instance with gbm, so gbm can convert
* wl_buffers to gbm bos. */
- dri2_dpy->gbm_dri->wl_drm = dri2_dpy->wl_server_drm;
+ if (dri2_dpy->gbm_dri)
+ dri2_dpy->gbm_dri->wl_drm = dri2_dpy->wl_server_drm;
return EGL_TRUE;
}
More information about the mesa-commit
mailing list