From e06f119d4e40f9a1be48457926fe1df342013da7 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Mon, 14 Sep 2015 17:22:16 -0600 Subject: bug 14509: Rename Layer and Extension queries https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14509 https://gitlab.khronos.org/vulkan/vulkan/merge_requests/334 --- layers/image.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'layers/image.cpp') diff --git a/layers/image.cpp b/layers/image.cpp index f41a0e0d..52297328 100644 --- a/layers/image.cpp +++ b/layers/image.cpp @@ -196,7 +196,7 @@ static const VkLayerProperties pc_global_layers[] = { } }; -VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionProperties( +VK_LAYER_EXPORT VkResult VKAPI vkEnumerateInstanceExtensionProperties( const char *pLayerName, uint32_t *pCount, VkExtensionProperties* pProperties) @@ -205,7 +205,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionProperties( return util_GetExtensionProperties(0, NULL, pCount, pProperties); } -VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalLayerProperties( +VK_LAYER_EXPORT VkResult VKAPI vkEnumerateInstanceLayerProperties( uint32_t *pCount, VkLayerProperties* pProperties) { @@ -214,7 +214,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalLayerProperties( pCount, pProperties); } -VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceExtensionProperties( +VK_LAYER_EXPORT VkResult VKAPI vkEnumerateDeviceExtensionProperties( VkPhysicalDevice physicalDevice, const char* pLayerName, uint32_t* pCount, @@ -224,7 +224,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceExtensionProperties( return util_GetExtensionProperties(0, NULL, pCount, pProperties); } -VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceLayerProperties( +VK_LAYER_EXPORT VkResult VKAPI vkEnumerateDeviceLayerProperties( VkPhysicalDevice physicalDevice, uint32_t* pCount, VkLayerProperties* pProperties) @@ -407,14 +407,14 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetInstanceProcAddr(VkInstance instan return (PFN_vkVoidFunction) vkCreateInstance; if (!strcmp(funcName, "vkDestroyInstance")) return (PFN_vkVoidFunction) vkDestroyInstance; - if (!strcmp(funcName, "vkGetGlobalLayerProperties")) - return (PFN_vkVoidFunction) vkGetGlobalLayerProperties; - if (!strcmp(funcName, "vkGetGlobalExtensionProperties")) - return (PFN_vkVoidFunction) vkGetGlobalExtensionProperties; - if (!strcmp(funcName, "vkGetPhysicalDeviceLayerProperties")) - return (PFN_vkVoidFunction) vkGetPhysicalDeviceLayerProperties; - if (!strcmp(funcName, "vkGetPhysicalDeviceExtensionProperties")) - return (PFN_vkVoidFunction) vkGetPhysicalDeviceExtensionProperties; + if (!strcmp(funcName, "vkEnumerateInstanceLayerProperties")) + return (PFN_vkVoidFunction) vkEnumerateInstanceLayerProperties; + if (!strcmp(funcName, "vkEnumerateInstanceExtensionProperties")) + return (PFN_vkVoidFunction) vkEnumerateInstanceExtensionProperties; + if (!strcmp(funcName, "vkEnumerateDeviceLayerProperties")) + return (PFN_vkVoidFunction) vkEnumerateDeviceLayerProperties; + if (!strcmp(funcName, "vkEnumerateDeviceExtensionProperties")) + return (PFN_vkVoidFunction) vkEnumerateDeviceExtensionProperties; layer_data *data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map); PFN_vkVoidFunction fptr = debug_report_get_instance_proc_addr(data->report_data, funcName); -- cgit v1.2.3