diff options
| -rw-r--r-- | include/vulkan/vulkan.h | 6 | ||||
| -rw-r--r-- | src/vulkan/formats.c | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index cd270b3b1ad..b5526286112 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -1999,7 +1999,7 @@ typedef VkResult (VKAPI *PFN_vkCreateInstance)(const VkInstanceCreateInfo* pCrea typedef VkResult (VKAPI *PFN_vkDestroyInstance)(VkInstance instance); typedef VkResult (VKAPI *PFN_vkEnumeratePhysicalDevices)(VkInstance instance, uint32_t* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices); typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceFeatures)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures* pFeatures); -typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceFormatInfo)(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties* pFormatInfo); +typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceFormatProperties)(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties* pFormatProperties); typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceLimits)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceLimits* pLimits); typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceProperties)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties* pProperties); typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceQueueCount)(VkPhysicalDevice physicalDevice, uint32_t* pCount); @@ -2157,10 +2157,10 @@ VkResult VKAPI vkGetPhysicalDeviceFeatures( VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures* pFeatures); -VkResult VKAPI vkGetPhysicalDeviceFormatInfo( +VkResult VKAPI vkGetPhysicalDeviceFormatProperties( VkPhysicalDevice physicalDevice, VkFormat format, - VkFormatProperties* pFormatInfo); + VkFormatProperties* pFormatProperties); VkResult VKAPI vkGetPhysicalDeviceLimits( VkPhysicalDevice physicalDevice, diff --git a/src/vulkan/formats.c b/src/vulkan/formats.c index a00dc8df75a..361dd70fa3e 100644 --- a/src/vulkan/formats.c +++ b/src/vulkan/formats.c @@ -245,20 +245,20 @@ struct surface_format_info { extern const struct surface_format_info surface_formats[]; -VkResult anv_validate_GetPhysicalDeviceFormatInfo( +VkResult anv_validate_GetPhysicalDeviceFormatProperties( VkPhysicalDevice physicalDevice, VkFormat _format, - VkFormatProperties* pFormatInfo) + VkFormatProperties* pFormatProperties) { const struct anv_format *format = anv_format_for_vk_format(_format); - fprintf(stderr, "vkGetFormatInfo(%s)\n", format->name); - return anv_GetPhysicalDeviceFormatInfo(physicalDevice, _format, pFormatInfo); + fprintf(stderr, "vkGetFormatProperties(%s)\n", format->name); + return anv_GetPhysicalDeviceFormatProperties(physicalDevice, _format, pFormatProperties); } -VkResult anv_GetPhysicalDeviceFormatInfo( +VkResult anv_GetPhysicalDeviceFormatProperties( VkPhysicalDevice physicalDevice, VkFormat _format, - VkFormatProperties* pFormatInfo) + VkFormatProperties* pFormatProperties) { ANV_FROM_HANDLE(anv_physical_device, physical_device, physicalDevice); const struct surface_format_info *info; @@ -296,14 +296,14 @@ VkResult anv_GetPhysicalDeviceFormatInfo( linear |= VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT; } - pFormatInfo->linearTilingFeatures = linear; - pFormatInfo->optimalTilingFeatures = tiled; + pFormatProperties->linearTilingFeatures = linear; + pFormatProperties->optimalTilingFeatures = tiled; return VK_SUCCESS; unsupported: - pFormatInfo->linearTilingFeatures = 0; - pFormatInfo->optimalTilingFeatures = 0; + pFormatProperties->linearTilingFeatures = 0; + pFormatProperties->optimalTilingFeatures = 0; return VK_SUCCESS; } |