From 1d3492706156b2caa7eb3b84125dbabc999695aa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 11 Oct 2013 15:30:09 -0700 Subject: [PATCH] wayland: Only pass wl_drm instance to gbm when using gbm platform --- src/egl/drivers/dri2/egl_dri2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; } -- 2.7.4