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>
This commit is contained in:
Jakob Bornecrantz 2012-08-21 18:01:55 +02:00
parent 6bb71b8cbe
commit 93ebec87ed
2 changed files with 5 additions and 1 deletions

View File

@ -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;

View File

@ -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: