fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-05 00:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gbm: Bump required __DRI_IMAGE version to 6.

Browse source 
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>
This commit is contained in:
Emma Anholt 2022-11-28 11:34:58 -08:00 • committed by Marge Bot
parent 65822a31e2
commit bb28bff583
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gbm/backends/dri/gbm_dri.c
View file

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