Mesa (10.1): wayland: Fix the logic in disabling the prime capability
Carl Worth
cworth at kemper.freedesktop.org
Thu May 1 14:31:39 UTC 2014
Module: Mesa
Branch: 10.1
Commit: c6cffb99dd6297e719ad41562f30ff99429eeba7
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c6cffb99dd6297e719ad41562f30ff99429eeba7
Author: Neil Roberts <neil at linux.intel.com>
Date: Tue Apr 8 23:28:40 2014 +0300
wayland: Fix the logic in disabling the prime capability
It looks like this bit of code is trying to disable the prime capability if
the driver doesn't support createImageFromFds. However the logic looks a bit
broken and what it would actually do is disable all other capabilities apart
from prime. This patch fixes it to actually disable prime.
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 63d4661ab28c036ab000f94812a91d93d538a72a)
---
src/egl/drivers/dri2/platform_wayland.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index 50750a9..aa7b616 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -1045,7 +1045,7 @@ dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp)
if (dri2_dpy->image->base.version < 7 ||
dri2_dpy->image->createImageFromFds == NULL)
- dri2_dpy->capabilities &= WL_DRM_CAPABILITY_PRIME;
+ dri2_dpy->capabilities &= ~WL_DRM_CAPABILITY_PRIME;
types = EGL_WINDOW_BIT;
for (i = 0; dri2_dpy->driver_configs[i]; i++) {
More information about the mesa-commit
mailing list