Module: Mesa Branch: main Commit: 99ff88cb5eaf66858a78aca9045f34b559a7abed URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=99ff88cb5eaf66858a78aca9045f34b559a7abed
Author: Mike Blumenkrantz <[email protected]> Date: Tue Sep 19 10:42:35 2023 -0400 zink: delete some dead modifier handling this is no longer hit Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25299> --- src/gallium/drivers/zink/zink_resource.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index fd1ed0ced79..b1442eabfa7 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -885,17 +885,6 @@ resource_object_create(struct zink_screen *screen, const struct pipe_resource *t } else { max_level = templ->last_level + 1; bool winsys_modifier = (export_types & VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT) && whandle && whandle->modifier != DRM_FORMAT_MOD_INVALID; - uint64_t mods[10]; - bool try_modifiers = false; - if ((export_types & VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT) && - whandle && whandle->modifier == DRM_FORMAT_MOD_INVALID && whandle->stride) { - modifiers = mods; - modifiers_count = screen->modifier_props[templ->format].drmFormatModifierCount; - for (unsigned j = 0; j < modifiers_count; j++) - mods[j] = screen->modifier_props[templ->format].pDrmFormatModifierProperties[j].drmFormatModifier; - if (modifiers_count > 1) - try_modifiers = true; - } uint64_t *ici_modifiers = winsys_modifier ? &whandle->modifier : modifiers; unsigned ici_modifier_count = winsys_modifier ? 1 : modifiers_count; bool success = false; @@ -1078,18 +1067,6 @@ resource_object_create(struct zink_screen *screen, const struct pipe_resource *t } VkResult result = VKSCR(CreateImage)(screen->dev, &ici, NULL, &obj->image); - if (result != VK_SUCCESS) { - if (try_modifiers) { - for (unsigned i = 0; i < modifiers_count; i++) { - if (modifiers[i] == mod) - continue; - idfmeci.drmFormatModifier = modifiers[i]; - result = VKSCR(CreateImage)(screen->dev, &ici, NULL, &obj->image); - if (result == VK_SUCCESS) - break; - } - } - } if (result != VK_SUCCESS) { mesa_loge("ZINK: vkCreateImage failed (%s)", vk_Result_to_str(result)); goto fail1;
