diff options
| author | Jakob Bornecrantz <[email protected]> | 2012-08-21 18:01:55 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <[email protected]> | 2012-08-26 15:39:50 +0200 |
| commit | 93ebec87ed46978942464a6f08801ae06e86fa8b (patch) | |
| tree | ab4582979e99ca15294f8ae537c4d487c3285220 | |
| parent | 6bb71b8cbe6b17a5d59e369631502e642804406e (diff) | |
dri: Make query image WIDTH and HEIGHT be version 4
Tested-by: Scott Moreau <[email protected]>
Signed-off-by: Jakob Bornecrantz <[email protected]>
| -rw-r--r-- | include/GL/internal/dri_interface.h | 2 | ||||
| -rw-r--r-- | src/gbm/backends/dri/gbm_dri.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h index e7662264d9d..09f63ffdc96 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 59a3d813165..1831f137789 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: |