vk/vulkan.h: Switch from GetImageSubresourceInfo to GetImageSubresourceLayout

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 8a5935564145fcbb0dcf060b37e054c3b4acb6c4..96695e37acd32e9f7cde932f7b11eeee14898e9a 100644 (file)
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -1106,13 +1106,6 @@ typedef enum {
     VK_ENUM_RANGE(FORMAT_INFO_TYPE, PROPERTIES, PROPERTIES)
 } VkFormatInfoType;
 
-typedef enum {
-    // Info type for vkGetImageSubresourceInfo()
-    VK_SUBRESOURCE_INFO_TYPE_LAYOUT                         = 0x00000000,
-
-    VK_ENUM_RANGE(SUBRESOURCE_INFO_TYPE, LAYOUT, LAYOUT)
-} VkSubresourceInfoType;
-
 
 // Physical device compatibility flags
 typedef VkFlags VkPhysicalDeviceCompatibilityFlags;
@@ -1943,7 +1936,7 @@ typedef VkResult (VKAPI *PFN_vkGetFormatInfo)(VkDevice device, VkFormat format,
 typedef VkResult (VKAPI *PFN_vkCreateBuffer)(VkDevice device, const VkBufferCreateInfo* pCreateInfo, VkBuffer* pBuffer);
 typedef VkResult (VKAPI *PFN_vkCreateBufferView)(VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, VkBufferView* pView);
 typedef VkResult (VKAPI *PFN_vkCreateImage)(VkDevice device, const VkImageCreateInfo* pCreateInfo, VkImage* pImage);
-typedef VkResult (VKAPI *PFN_vkGetImageSubresourceInfo)(VkDevice device, VkImage image, const VkImageSubresource* pSubresource, VkSubresourceInfoType infoType, size_t* pDataSize, void* pData);
+typedef VkResult (VKAPI *PFN_vkGetImageSubresourceLayout)(VkDevice device, VkImage image, const VkImageSubresource* pSubresource, VkSubresourceLayout* pLayout);
 typedef VkResult (VKAPI *PFN_vkCreateImageView)(VkDevice device, const VkImageViewCreateInfo* pCreateInfo, VkImageView* pView);
 typedef VkResult (VKAPI *PFN_vkCreateColorAttachmentView)(VkDevice device, const VkColorAttachmentViewCreateInfo* pCreateInfo, VkColorAttachmentView* pView);
 typedef VkResult (VKAPI *PFN_vkCreateDepthStencilView)(VkDevice device, const VkDepthStencilViewCreateInfo* pCreateInfo, VkDepthStencilView* pView);
@@ -2233,13 +2226,11 @@ VkResult VKAPI vkCreateImage(
     const VkImageCreateInfo*                    pCreateInfo,
     VkImage*                                    pImage);
 
-VkResult VKAPI vkGetImageSubresourceInfo(
+VkResult VKAPI vkGetImageSubresourceLayout(
     VkDevice                                    device,
     VkImage                                     image,
     const VkImageSubresource*                   pSubresource,
-    VkSubresourceInfoType                       infoType,
-    size_t*                                     pDataSize,
-    void*                                       pData);
+    VkSubresourceLayout*                        pLayout);
 
 VkResult VKAPI vkCreateImageView(
     VkDevice                                    device,

diff --git a/src/vulkan/image.c b/src/vulkan/image.c
index 81d5f100ba6220c3d85a72e04d548014c6a91507..be80a5d53dc38789420fb3c17a2216a72957c687 100644 (file)
--- a/src/vulkan/image.c
+++ b/src/vulkan/image.c
@@ -306,13 +306,11 @@ anv_CreateImage(VkDevice device,
       pImage);
 }
 
-VkResult
-anv_GetImageSubresourceInfo(VkDevice device,
-                            VkImage image,
-                            const VkImageSubresource *pSubresource,
-                            VkSubresourceInfoType infoType,
-                            size_t *pDataSize,
-                            void *pData)
+VkResult anv_GetImageSubresourceLayout(
+    VkDevice                                    device,
+    VkImage                                     image,
+    const VkImageSubresource*                   pSubresource,
+    VkSubresourceLayout*                        pLayout)
 {
    stub_return(VK_UNSUPPORTED);
 }