OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vk/0.210.0: Rename property pCount parameters

Browse Source
This commit is contained in:
Jason Ekstrand
2015-11-30 16:28:36 -08:00
parent e8f2294cd2
commit fe644721aa
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/vulkan/vulkan.h
View File

@@ -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 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 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_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 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_vkGetInstanceProcAddr)(VkInstance instance, const char* pName);
typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_vkGetDeviceProcAddr)(VkDevice device, 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 VkResult (VKAPI_PTR *PFN_vkCreateDevice)(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, VkDevice* pDevice);
typedef void (VKAPI_PTR *PFN_vkDestroyDevice)(VkDevice device); 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_vkEnumerateInstanceExtensionProperties)(const char* pLayerName, uint32_t* pPropertyCount, VkExtensionProperties* pProperties);
typedef VkResult (VKAPI_PTR *PFN_vkEnumerateDeviceExtensionProperties)(VkPhysicalDevice physicalDevice, const char* pLayerName, uint32_t* pCount, 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* pCount, VkLayerProperties* pProperties); typedef VkResult (VKAPI_PTR *PFN_vkEnumerateInstanceLayerProperties)(uint32_t* pPropertyCount, VkLayerProperties* pProperties);
typedef VkResult (VKAPI_PTR *PFN_vkEnumerateDeviceLayerProperties)(VkPhysicalDevice physicalDevice, uint32_t* pCount, 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 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_vkQueueSubmit)(VkQueue queue, uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers, VkFence fence);
typedef VkResult (VKAPI_PTR *PFN_vkQueueWaitIdle)(VkQueue queue); typedef VkResult (VKAPI_PTR *PFN_vkQueueWaitIdle)(VkQueue queue);
@@ -2253,7 +2253,7 @@ VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceProperties(
VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceQueueFamilyProperties( VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceQueueFamilyProperties(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
uint32_t* pCount, uint32_t* pQueueFamilyPropertyCount,
VkQueueFamilyProperties* pQueueFamilyProperties); VkQueueFamilyProperties* pQueueFamilyProperties);
VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceMemoryProperties( VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceMemoryProperties(
@@ -2278,22 +2278,22 @@ VKAPI_ATTR void VKAPI_CALL vkDestroyDevice(
VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceExtensionProperties( VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceExtensionProperties(
const char* pLayerName, const char* pLayerName,
uint32_t* pCount, uint32_t* pPropertyCount,
VkExtensionProperties* pProperties); VkExtensionProperties* pProperties);
VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceExtensionProperties( VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceExtensionProperties(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
const char* pLayerName, const char* pLayerName,
uint32_t* pCount, uint32_t* pPropertyCount,
VkExtensionProperties* pProperties); VkExtensionProperties* pProperties);
VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceLayerProperties( VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceLayerProperties(
uint32_t* pCount, uint32_t* pPropertyCount,
VkLayerProperties* pProperties); VkLayerProperties* pProperties);
VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceLayerProperties( VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceLayerProperties(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
uint32_t* pCount, uint32_t* pPropertyCount,
VkLayerProperties* pProperties); VkLayerProperties* pProperties);
VKAPI_ATTR void VKAPI_CALL vkGetDeviceQueue( VKAPI_ATTR void VKAPI_CALL vkGetDeviceQueue(

24
src/vulkan/anv_device.c
View File

@@ -725,17 +725,17 @@ void anv_DestroyDevice(
VkResult anv_EnumerateInstanceExtensionProperties( VkResult anv_EnumerateInstanceExtensionProperties(
const char* pLayerName, const char* pLayerName,
uint32_t* pCount, uint32_t* pPropertyCount,
VkExtensionProperties* pProperties) VkExtensionProperties* pProperties)
{ {
if (pProperties == NULL) { if (pProperties == NULL) {
*pCount = ARRAY_SIZE(global_extensions); *pPropertyCount = ARRAY_SIZE(global_extensions);
return VK_SUCCESS; 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)); memcpy(pProperties, global_extensions, sizeof(global_extensions));
return VK_SUCCESS; return VK_SUCCESS;
@@ -744,28 +744,28 @@ VkResult anv_EnumerateInstanceExtensionProperties(
VkResult anv_EnumerateDeviceExtensionProperties( VkResult anv_EnumerateDeviceExtensionProperties(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
const char* pLayerName, const char* pLayerName,
uint32_t* pCount, uint32_t* pPropertyCount,
VkExtensionProperties* pProperties) VkExtensionProperties* pProperties)
{ {
if (pProperties == NULL) { if (pProperties == NULL) {
*pCount = ARRAY_SIZE(device_extensions); *pPropertyCount = ARRAY_SIZE(device_extensions);
return VK_SUCCESS; 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)); memcpy(pProperties, device_extensions, sizeof(device_extensions));
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult anv_EnumerateInstanceLayerProperties( VkResult anv_EnumerateInstanceLayerProperties(
uint32_t* pCount, uint32_t* pPropertyCount,
VkLayerProperties* pProperties) VkLayerProperties* pProperties)
{ {
if (pProperties == NULL) { if (pProperties == NULL) {
*pCount = 0; *pPropertyCount = 0;
return VK_SUCCESS; return VK_SUCCESS;
} }
@@ -775,11 +775,11 @@ VkResult anv_EnumerateInstanceLayerProperties(
VkResult anv_EnumerateDeviceLayerProperties( VkResult anv_EnumerateDeviceLayerProperties(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
uint32_t* pCount, uint32_t* pPropertyCount,
VkLayerProperties* pProperties) VkLayerProperties* pProperties)
{ {
if (pProperties == NULL) { if (pProperties == NULL) {
*pCount = 0; *pPropertyCount = 0;
return VK_SUCCESS; return VK_SUCCESS;
} }