diff options
| -rw-r--r-- | include/vulkan/vulkan.h | 20 | ||||
| -rw-r--r-- | src/vulkan/anv_device.c | 24 |
2 files changed, 22 insertions, 22 deletions
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index 986b86b4f43..3d141124d5a 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -2078,16 +2078,16 @@ typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceFeatures)(VkPhysicalDevice physi typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceFormatProperties)(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties* pFormatProperties); typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceImageFormatProperties)(VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling, VkImageUsageFlags usage, VkImageCreateFlags flags, VkImageFormatProperties* pImageFormatProperties); typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceProperties)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties* pProperties); -typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceQueueFamilyProperties)(VkPhysicalDevice physicalDevice, uint32_t* pCount, VkQueueFamilyProperties* pQueueFamilyProperties); +typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceQueueFamilyProperties)(VkPhysicalDevice physicalDevice, uint32_t* pQueueFamilyPropertyCount, VkQueueFamilyProperties* pQueueFamilyProperties); typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceMemoryProperties)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties* pMemoryProperties); typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_vkGetInstanceProcAddr)(VkInstance instance, const char* pName); typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_vkGetDeviceProcAddr)(VkDevice device, const char* pName); typedef VkResult (VKAPI_PTR *PFN_vkCreateDevice)(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, VkDevice* pDevice); typedef void (VKAPI_PTR *PFN_vkDestroyDevice)(VkDevice device); -typedef VkResult (VKAPI_PTR *PFN_vkEnumerateInstanceExtensionProperties)(const char* pLayerName, uint32_t* pCount, VkExtensionProperties* pProperties); -typedef VkResult (VKAPI_PTR *PFN_vkEnumerateDeviceExtensionProperties)(VkPhysicalDevice physicalDevice, const char* pLayerName, uint32_t* pCount, VkExtensionProperties* pProperties); -typedef VkResult (VKAPI_PTR *PFN_vkEnumerateInstanceLayerProperties)(uint32_t* pCount, VkLayerProperties* pProperties); -typedef VkResult (VKAPI_PTR *PFN_vkEnumerateDeviceLayerProperties)(VkPhysicalDevice physicalDevice, uint32_t* pCount, VkLayerProperties* pProperties); +typedef VkResult (VKAPI_PTR *PFN_vkEnumerateInstanceExtensionProperties)(const char* pLayerName, uint32_t* pPropertyCount, VkExtensionProperties* pProperties); +typedef VkResult (VKAPI_PTR *PFN_vkEnumerateDeviceExtensionProperties)(VkPhysicalDevice physicalDevice, const char* pLayerName, uint32_t* pPropertyCount, VkExtensionProperties* pProperties); +typedef VkResult (VKAPI_PTR *PFN_vkEnumerateInstanceLayerProperties)(uint32_t* pPropertyCount, VkLayerProperties* pProperties); +typedef VkResult (VKAPI_PTR *PFN_vkEnumerateDeviceLayerProperties)(VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkLayerProperties* pProperties); typedef void (VKAPI_PTR *PFN_vkGetDeviceQueue)(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue* pQueue); typedef VkResult (VKAPI_PTR *PFN_vkQueueSubmit)(VkQueue queue, uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers, VkFence fence); typedef VkResult (VKAPI_PTR *PFN_vkQueueWaitIdle)(VkQueue queue); @@ -2253,7 +2253,7 @@ VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceProperties( VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceQueueFamilyProperties( VkPhysicalDevice physicalDevice, - uint32_t* pCount, + uint32_t* pQueueFamilyPropertyCount, VkQueueFamilyProperties* pQueueFamilyProperties); VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceMemoryProperties( @@ -2278,22 +2278,22 @@ VKAPI_ATTR void VKAPI_CALL vkDestroyDevice( VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceExtensionProperties( const char* pLayerName, - uint32_t* pCount, + uint32_t* pPropertyCount, VkExtensionProperties* pProperties); VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceExtensionProperties( VkPhysicalDevice physicalDevice, const char* pLayerName, - uint32_t* pCount, + uint32_t* pPropertyCount, VkExtensionProperties* pProperties); VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceLayerProperties( - uint32_t* pCount, + uint32_t* pPropertyCount, VkLayerProperties* pProperties); VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceLayerProperties( VkPhysicalDevice physicalDevice, - uint32_t* pCount, + uint32_t* pPropertyCount, VkLayerProperties* pProperties); VKAPI_ATTR void VKAPI_CALL vkGetDeviceQueue( diff --git a/src/vulkan/anv_device.c b/src/vulkan/anv_device.c index 49d74bbfc78..dc5cbd6344d 100644 --- a/src/vulkan/anv_device.c +++ b/src/vulkan/anv_device.c @@ -725,17 +725,17 @@ void anv_DestroyDevice( VkResult anv_EnumerateInstanceExtensionProperties( const char* pLayerName, - uint32_t* pCount, + uint32_t* pPropertyCount, VkExtensionProperties* pProperties) { if (pProperties == NULL) { - *pCount = ARRAY_SIZE(global_extensions); + *pPropertyCount = ARRAY_SIZE(global_extensions); return VK_SUCCESS; } - assert(*pCount >= ARRAY_SIZE(global_extensions)); + assert(*pPropertyCount >= ARRAY_SIZE(global_extensions)); - *pCount = ARRAY_SIZE(global_extensions); + *pPropertyCount = ARRAY_SIZE(global_extensions); memcpy(pProperties, global_extensions, sizeof(global_extensions)); return VK_SUCCESS; @@ -744,28 +744,28 @@ VkResult anv_EnumerateInstanceExtensionProperties( VkResult anv_EnumerateDeviceExtensionProperties( VkPhysicalDevice physicalDevice, const char* pLayerName, - uint32_t* pCount, + uint32_t* pPropertyCount, VkExtensionProperties* pProperties) { if (pProperties == NULL) { - *pCount = ARRAY_SIZE(device_extensions); + *pPropertyCount = ARRAY_SIZE(device_extensions); return VK_SUCCESS; } - assert(*pCount >= ARRAY_SIZE(device_extensions)); + assert(*pPropertyCount >= ARRAY_SIZE(device_extensions)); - *pCount = ARRAY_SIZE(device_extensions); + *pPropertyCount = ARRAY_SIZE(device_extensions); memcpy(pProperties, device_extensions, sizeof(device_extensions)); return VK_SUCCESS; } VkResult anv_EnumerateInstanceLayerProperties( - uint32_t* pCount, + uint32_t* pPropertyCount, VkLayerProperties* pProperties) { if (pProperties == NULL) { - *pCount = 0; + *pPropertyCount = 0; return VK_SUCCESS; } @@ -775,11 +775,11 @@ VkResult anv_EnumerateInstanceLayerProperties( VkResult anv_EnumerateDeviceLayerProperties( VkPhysicalDevice physicalDevice, - uint32_t* pCount, + uint32_t* pPropertyCount, VkLayerProperties* pProperties) { if (pProperties == NULL) { - *pCount = 0; + *pPropertyCount = 0; return VK_SUCCESS; } |