dri: Remove old createImageWithModifiers

Everyone can use createImageWithModifiers2, which is now just called
createImageWithModifiers.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30245>
This commit is contained in:
Daniel Stone
2024-05-15 15:45:18 +01:00
committed by Marge Bot
parent 3bfd157483
commit 60cb420996
5 changed files with 18 additions and 60 deletions
+1 -1
View File
@@ -1463,7 +1463,7 @@ dri3_alloc_render_buffer(struct loader_dri3_drawable *draw, unsigned int format,
#ifdef HAVE_DRI3_MODIFIERS
if (draw->multiplanes_available &&
draw->ext->image->queryDmaBufModifiers &&
draw->ext->image->createImageWithModifiers2) {
draw->ext->image->createImageWithModifiers) {
xcb_dri3_get_supported_modifiers_cookie_t mod_cookie;
xcb_dri3_get_supported_modifiers_reply_t *mod_reply;
xcb_generic_error_t *error = NULL;
+5 -5
View File
@@ -38,7 +38,7 @@ __DRIimage *loader_dri_create_image(__DRIscreen *screen,
unsigned int modifiers_count,
void *loaderPrivate)
{
if (modifiers && modifiers_count > 0 && image->createImageWithModifiers2) {
if (modifiers && modifiers_count > 0 && image->createImageWithModifiers) {
bool has_valid_modifier = false;
int i;
@@ -57,10 +57,10 @@ __DRIimage *loader_dri_create_image(__DRIscreen *screen,
if (!has_valid_modifier)
return NULL;
return image->createImageWithModifiers2(screen, width, height,
dri_format, modifiers,
modifiers_count, dri_usage,
loaderPrivate);
return image->createImageWithModifiers(screen, width, height,
dri_format, modifiers,
modifiers_count, dri_usage,
loaderPrivate);
}
/* No modifier given or fallback to the legacy createImage allowed */