summaryrefslogtreecommitdiff
path: root/glamor
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2018-03-28 12:46:01 -0400
committerAdam Jackson <ajax@redhat.com>2018-03-28 16:34:28 -0400
commitd11d5bb80d21f2aaa54ddf2f26a50aa6ef31d2fa (patch)
tree73b383ac89b9de7bd12fa48b4582787730d0007f /glamor
parentdf13ea7da9174d2e1c732985d9b7a9a35a6916bc (diff)
glamor: Hide new DRI behind Option "Debug" "dmabuf_capable"
... for xfree86, at least for now. Things appear to work for Xwayland but not yet for modesetting. Hopefully we can fix that before 1.20 but in the meantime this makes testing both paths easier than a rebuild. Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'glamor')
-rw-r--r--glamor/glamor_egl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 2ea3efc58..4a550932a 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -35,6 +35,7 @@
#include <sys/ioctl.h>
#include <errno.h>
#include <xf86.h>
+#include <xf86Priv.h>
#include <xf86drm.h>
#define EGL_DISPLAY_NO_X_MESA
@@ -960,7 +961,8 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
"EGL_EXT_image_dma_buf_import") &&
epoxy_has_egl_extension(glamor_egl->display,
"EGL_EXT_image_dma_buf_import_modifiers"))
- glamor_egl->dmabuf_capable = TRUE;
+ glamor_egl->dmabuf_capable = !!strstr(xf86Info.debug,
+ "dmabuf_capable");
#endif
glamor_egl->saved_free_screen = scrn->FreeScreen;