diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2013-10-11 15:30:09 -0700 |
|---|---|---|
| committer | Alex Wu <zhiwen.wu@linux.intel.com> | 2013-11-19 16:55:18 +0800 |
| commit | f1777742393e660a8536e1921ca3bd47d4d2bfce (patch) | |
| tree | f7f203c0f0ba3f099a91ad136ea35d8e9a72d1bf | |
| parent | 203af76ed5a6a85290d8ca298e117315fba6b3e4 (diff) | |
| download | mesa-f1777742393e660a8536e1921ca3bd47d4d2bfce.tar.gz mesa-f1777742393e660a8536e1921ca3bd47d4d2bfce.tar.bz2 mesa-f1777742393e660a8536e1921ca3bd47d4d2bfce.zip | |
wayland: Only pass wl_drm instance to gbm when using gbm platformsubmit/tizen/20131125.193122submit/tizen/20131120.075426accepted/tizen/20131126.000616
Change-Id: Id6dd84f9194f8315e0c15031fcf3d4ad06dad228
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
| -rw-r--r-- | 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 5e55b5f870d..9e3e82a04f1 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -1593,7 +1593,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; } |