KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vk/vulkan.h: Rename FormatInfo to FormatProperties

This commit is contained in:
Jason Ekstrand 2015-07-14 17:04:46 -07:00
parent d7f44852be
commit 2c4dc92f40
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/vulkan/vulkan.h
View File

@ -1999,7 +1999,7 @@ typedef VkResult (VKAPI *PFN_vkCreateInstance)(const VkInstanceCreateInfo* pCrea
typedef VkResult (VKAPI *PFN_vkDestroyInstance)(VkInstance instance); typedef VkResult (VKAPI *PFN_vkDestroyInstance)(VkInstance instance);
typedef VkResult (VKAPI *PFN_vkEnumeratePhysicalDevices)(VkInstance instance, uint32_t* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices); 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_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_vkGetPhysicalDeviceLimits)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceLimits* pLimits);
typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceProperties)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties* pProperties); typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceProperties)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties* pProperties);
typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceQueueCount)(VkPhysicalDevice physicalDevice, uint32_t* pCount); typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceQueueCount)(VkPhysicalDevice physicalDevice, uint32_t* pCount);
@ -2157,10 +2157,10 @@ VkResult VKAPI vkGetPhysicalDeviceFeatures(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
VkPhysicalDeviceFeatures* pFeatures); VkPhysicalDeviceFeatures* pFeatures);
VkResult VKAPI vkGetPhysicalDeviceFormatInfo( VkResult VKAPI vkGetPhysicalDeviceFormatProperties(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
VkFormat format, VkFormat format,
VkFormatProperties* pFormatInfo); VkFormatProperties* pFormatProperties);
VkResult VKAPI vkGetPhysicalDeviceLimits( VkResult VKAPI vkGetPhysicalDeviceLimits(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,

20
src/vulkan/formats.c
View File

@ -245,20 +245,20 @@ struct surface_format_info {
extern const struct surface_format_info surface_formats[]; extern const struct surface_format_info surface_formats[];
VkResult anv_validate_GetPhysicalDeviceFormatInfo( VkResult anv_validate_GetPhysicalDeviceFormatProperties(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
VkFormat _format, VkFormat _format,
VkFormatProperties* pFormatInfo) VkFormatProperties* pFormatProperties)
{ {
const struct anv_format *format = anv_format_for_vk_format(_format); const struct anv_format *format = anv_format_for_vk_format(_format);
fprintf(stderr, "vkGetFormatInfo(%s)\n", format->name); fprintf(stderr, "vkGetFormatProperties(%s)\n", format->name);
return anv_GetPhysicalDeviceFormatInfo(physicalDevice, _format, pFormatInfo); return anv_GetPhysicalDeviceFormatProperties(physicalDevice, _format, pFormatProperties);
} }
VkResult anv_GetPhysicalDeviceFormatInfo( VkResult anv_GetPhysicalDeviceFormatProperties(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
VkFormat _format, VkFormat _format,
VkFormatProperties* pFormatInfo) VkFormatProperties* pFormatProperties)
{ {
ANV_FROM_HANDLE(anv_physical_device, physical_device, physicalDevice); ANV_FROM_HANDLE(anv_physical_device, physical_device, physicalDevice);
const struct surface_format_info *info; const struct surface_format_info *info;
@ -296,14 +296,14 @@ VkResult anv_GetPhysicalDeviceFormatInfo(
linear |= VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT; linear |= VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT;
} }
pFormatInfo->linearTilingFeatures = linear; pFormatProperties->linearTilingFeatures = linear;
pFormatInfo->optimalTilingFeatures = tiled; pFormatProperties->optimalTilingFeatures = tiled;
return VK_SUCCESS; return VK_SUCCESS;
unsupported: unsupported:
pFormatInfo->linearTilingFeatures = 0; pFormatProperties->linearTilingFeatures = 0;
pFormatInfo->optimalTilingFeatures = 0; pFormatProperties->optimalTilingFeatures = 0;
return VK_SUCCESS; return VK_SUCCESS;
} }