From: Jakob Bornecrantz <jakob@vmware.com>
Date: Tue, 21 Aug 2012 16:01:55 +0000 (+0200)
Subject: dri: Make query image WIDTH and HEIGHT be version 4
X-Git-Tag: accepted/2.0alpha-wayland/20121114.171706~300
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93ebec87ed46978942464a6f08801ae06e86fa8b;p=profile%2Fivi%2Fmesa.git

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 e766226..09f63ff 100644
--- 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 59a3d81..1831f13 100644
--- 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: