diff options
| author | Emma Anholt <emma@anholt.net> | 2022-11-28 11:34:58 -0800 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-12-01 09:17:30 +0000 |
| commit | bb28bff583a3b99875dfe7ce732512eabf6a0b13 (patch) | |
| tree | 171652527024255e543bc05ee5a26f4983855e02 | |
| parent | 65822a31e24098f9f0a5ae1495448e6576358178 (diff) | |
gbm: Bump required __DRI_IMAGE version to 6.
That's the minimum implemented in tree (gallium swrast). Drops a few more
version checks.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20044>
| -rw-r--r-- | src/gbm/backends/dri/gbm_dri.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index a2bfabb1315..a5101dc14c8 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -295,7 +295,7 @@ struct dri_extension_match { static struct dri_extension_match dri_core_extensions[] = { { __DRI2_FLUSH, 1, offsetof(struct gbm_dri_device, flush), false }, - { __DRI_IMAGE, 1, offsetof(struct gbm_dri_device, image), false }, + { __DRI_IMAGE, 6, offsetof(struct gbm_dri_device, image), false }, { __DRI2_FENCE, 1, offsetof(struct gbm_dri_device, fence), true }, }; @@ -980,8 +980,7 @@ gbm_dri_bo_import(struct gbm_device *gbm, unsigned dri_use = 0; int gbm_format; - /* Required for query image WIDTH & HEIGHT */ - if (dri->image == NULL || dri->image->base.version < 4) { + if (dri->image == NULL) { errno = ENOSYS; return NULL; } @@ -1112,8 +1111,7 @@ gbm_dri_bo_import(struct gbm_device *gbm, dri_use |= __DRI_IMAGE_USE_SCANOUT; if (usage & GBM_BO_USE_CURSOR) dri_use |= __DRI_IMAGE_USE_CURSOR; - if (dri->image->base.version >= 2 && - !dri->image->validateUsage(bo->image, dri_use)) { + if (!dri->image->validateUsage(bo->image, dri_use)) { errno = EINVAL; dri->image->destroyImage(bo->image); free(bo); |