From b3266db918bdd483d23ade52be6caf05514a1be5 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Mon, 14 Oct 2024 17:03:50 -0700 Subject: [PATCH] panvk: remove panvk_GetImageDrmFormatModifierPropertiesEXT Init vk_image::drm_format_mod and let vk_common_GetImageDrmFormatModifierPropertiesEXT handle it. Part-of: --- src/panfrost/vulkan/panvk_image.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/panfrost/vulkan/panvk_image.c b/src/panfrost/vulkan/panvk_image.c index 8760df518aa..0d40267eb9b 100644 --- a/src/panfrost/vulkan/panvk_image.c +++ b/src/panfrost/vulkan/panvk_image.c @@ -305,6 +305,8 @@ panvk_CreateImage(VkDevice device, const VkImageCreateInfo *pCreateInfo, * modifier selection. */ panvk_image_select_mod(image, pCreateInfo); + image->vk.drm_format_mod = image->pimage.layout.modifier; + *pImage = panvk_image_to_handle(image); return VK_SUCCESS; } @@ -429,17 +431,3 @@ panvk_BindImageMemory2(VkDevice device, uint32_t bindInfoCount, return VK_SUCCESS; } - -VKAPI_ATTR VkResult VKAPI_CALL -panvk_GetImageDrmFormatModifierPropertiesEXT( - VkDevice device, VkImage _image, - VkImageDrmFormatModifierPropertiesEXT *pProperties) -{ - VK_FROM_HANDLE(panvk_image, image, _image); - - assert(pProperties->sType == - VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT); - - pProperties->drmFormatModifier = image->pimage.layout.modifier; - return VK_SUCCESS; -}