dri: Make query image WIDTH and HEIGHT be version 4

Tested-by: Scott Moreau <oreaus@gmail.com>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>

diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index e7662264d9d0f22c6b347ad804269a6feecbc066..09f63ffdc964b260f21e82a20f311811b125d700 100644 (file)
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -945,7 +945,7 @@ struct __DRIdri2ExtensionRec {
 #define __DRI_IMAGE_ATTRIB_HANDLE      0x2001
 #define __DRI_IMAGE_ATTRIB_NAME                0x2002
 #define __DRI_IMAGE_ATTRIB_FORMAT      0x2003 /* available in versions 3+ */
-#define __DRI_IMAGE_ATTRIB_WIDTH       0x2004 /* available in versions 5+ */
+#define __DRI_IMAGE_ATTRIB_WIDTH       0x2004 /* available in versions 4+ */
 #define __DRI_IMAGE_ATTRIB_HEIGHT      0x2005
 
 typedef struct __DRIimageRec          __DRIimage;

diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c
index 59a3d8131653abde8368ff11d82dba58442a4a2a..1831f1377897c6159b3e2e4319fa8d63fed94b68 100644 (file)
--- a/src/gbm/backends/dri/gbm_dri.c
+++ b/src/gbm/backends/dri/gbm_dri.c
@@ -365,6 +365,10 @@ gbm_dri_bo_import(struct gbm_device *gbm,
    unsigned dri_use = 0;
    int dri_format, width, height, gbm_format, stride, cpp, offset;
 
+   /* Required for query image WIDTH & HEIGHT */
+   if (dri->image->base.version < 4)
+      return NULL;
+
    switch (type) {
 #if HAVE_WAYLAND_PLATFORM
    case GBM_BO_IMPORT_WL_BUFFER: