Mesa (10.1): egl: Protect use of gbm_dri with ifdef HAVE_DRM_PLATFORM

Carl Worth cworth at kemper.freedesktop.org
Thu May 1 14:31:39 UTC 2014


Module: Mesa
Branch: 10.1
Commit: b7697b6e0ed73018ae80e31172ccf3116edf584e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b7697b6e0ed73018ae80e31172ccf3116edf584e

Author: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira at intel.com>
Date:   Tue Apr  8 23:28:42 2014 +0300

egl: Protect use of gbm_dri with ifdef HAVE_DRM_PLATFORM

Otherwise it fails to compile if the drm egl platform is disabled.

Cc: "10.0" "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit 17860309f17de78e729f77e86101004f61f6bcf3)

---

 src/egl/drivers/dri2/egl_dri2.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 56c19b8..23aa528 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1892,10 +1892,12 @@ dri2_bind_wayland_display_wl(_EGLDriver *drv, _EGLDisplay *disp,
    if (!dri2_dpy->wl_server_drm)
 	   return EGL_FALSE;
 
+#ifdef HAVE_DRM_PLATFORM
    /* We have to share the wl_drm instance with gbm, so gbm can convert
     * wl_buffers to gbm bos. */
    if (dri2_dpy->gbm_dri)
       dri2_dpy->gbm_dri->wl_drm = dri2_dpy->wl_server_drm;
+#endif
 
    return EGL_TRUE;
 }




More information about the mesa-commit mailing list