From db24afee2f3057f198f972838c91ecdf464c7f72 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 7 Jul 2015 18:20:18 -0700 Subject: [PATCH] vk/vulkan.h: Switch from GetImageSubresourceInfo to GetImageSubresourceLayout --- include/vulkan/vulkan.h | 15 +++------------ src/vulkan/image.c | 12 +++++------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index 8a593556414..96695e37acd 100644 --- 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 81d5f100ba6..be80a5d53dc 100644 --- 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); } -- 2.30.2