[Mesa-dev] [PATCH] Don't use gbm_dri_device when its not there

[Jørgen Lind]

---
 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 b29eb1c..b143a95 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1843,10 +1843,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;
 }
-- 
1.8.4.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] Dri2 egl filter away dobule buffer configs for pbuffers and pixmaps

[Jørgen Lind]

Make sure that a double buffered only config is returned when
eglChooseConfig attrib_list contains surfacetype of EGL_PBUFFER_BIT or
EGL_PIXMAP_BIT
---
 src/egl/drivers/dri2/egl_dri2.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index d795a2f..608ee4e 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -269,8 +269,8 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig 
*dri_config, int id,
   return NULL;
}
 
-   if (double_buffer) {
-  surface_type &= ~EGL_PIXMAP_BIT;
+   if (!conf->dri_single_config) {
+  surface_type &= 
~(EGL_PIXMAP_BIT|EGL_PBUFFER_BIT|EGL_SWAP_BEHAVIOR_PRESERVED_BIT);
}
 
conf->base.SurfaceType |= surface_type;
-- 
2.1.0

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev