[PATCH] intel: Adjust test to reflect that __DRI_IMAGE_USE_SHARE is always set

Rob Bradford rob at robster.org.uk
Wed Aug 22 11:40:34 PDT 2012


From: Rob Bradford <rob at linux.intel.com>

Following on from 61e95b8a5f8524c7ff726f92ef6edc6b6bb35196 that always adds
__DRI_IMAGE_USE_SHARE to every bo created. We need to adjust the test that
checks that __DRI_IMAGE_USE_WRITE is only set on cursors - since that is the
only place it is supported.

This fixes gbm_bo_create returning NULL for a previously valid set of flags on
Intel.

Signed-off-by: Rob Bradford <rob at linux.intel.com>
---
 src/mesa/drivers/dri/intel/intel_screen.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index f4c1602..729011b 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -341,7 +341,8 @@ intel_create_image(__DRIscreen *screen,
 
    /* We only support write for cursor drm images */
    if ((use & __DRI_IMAGE_USE_WRITE) &&
-       use != (__DRI_IMAGE_USE_WRITE | __DRI_IMAGE_USE_CURSOR))
+       use != (__DRI_IMAGE_USE_WRITE | __DRI_IMAGE_USE_CURSOR |
+               __DRI_IMAGE_USE_SHARE))
       return NULL;
 
    image = intel_allocate_image(format, loaderPrivate);
-- 
1.7.11.2



More information about the wayland-devel mailing list