diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-09-14 17:22:16 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-09-17 15:32:11 -0600 |
| commit | e06f119d4e40f9a1be48457926fe1df342013da7 (patch) | |
| tree | 6f7760f52a966f6d035f140523ee343016ffb420 /layers/basic.cpp | |
| parent | a147d979425f6cb6a5a32f5e6c645f94af3c726b (diff) | |
| download | usermoji-e06f119d4e40f9a1be48457926fe1df342013da7.tar.xz | |
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
Diffstat (limited to 'layers/basic.cpp')
| -rw-r--r-- | layers/basic.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/layers/basic.cpp b/layers/basic.cpp index 822646fa..6a26542b 100644 --- a/layers/basic.cpp +++ b/layers/basic.cpp @@ -60,7 +60,7 @@ static const VkLayerProperties basic_physicaldevice_layers[] = { }; /* Must use Vulkan name so that loader finds it */ -VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceLayerProperties( +VK_LAYER_EXPORT VkResult VKAPI vkEnumerateDeviceLayerProperties( VkPhysicalDevice physicalDevice, uint32_t* pCount, VkLayerProperties* pProperties) @@ -77,7 +77,7 @@ static const VkExtensionProperties basic_physicaldevice_extensions[] = { } }; -VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceExtensionProperties( +VK_LAYER_EXPORT VkResult VKAPI vkEnumerateDeviceExtensionProperties( VkPhysicalDevice physicalDevice, const char *pLayerName, uint32_t *pCount, @@ -166,10 +166,10 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetInstanceProcAddr(VkInstance instan return (PFN_vkVoidFunction) vkGetInstanceProcAddr; } - if (!strcmp("vkGetPhysicalDeviceLayerProperties", pName)) - return (PFN_vkVoidFunction) vkGetPhysicalDeviceLayerProperties; - if (!strcmp("vkGetPhysicalDeviceExtensionProperties", pName)) - return (PFN_vkVoidFunction) vkGetPhysicalDeviceExtensionProperties; + if (!strcmp("vkEnumerateDeviceLayerProperties", pName)) + return (PFN_vkVoidFunction) vkEnumerateDeviceLayerProperties; + if (!strcmp("vkEnumerateDeviceExtensionProperties", pName)) + return (PFN_vkVoidFunction) vkEnumerateDeviceExtensionProperties; if (!strcmp("vkGetPhysicalDeviceFormatProperties", pName)) return (PFN_vkVoidFunction) basic_GetPhysicalDeviceFormatProperties; if (!strcmp("vkDestroyInstance", pName)) @@ -182,12 +182,12 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetInstanceProcAddr(VkInstance instan return instance_dispatch_table(instance)->GetInstanceProcAddr(instance, pName); } -VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionProperties(const char *pLayerName, uint32_t *pCount, VkExtensionProperties* pProperties) +VK_LAYER_EXPORT VkResult VKAPI vkEnumerateInstanceExtensionProperties(const char *pLayerName, uint32_t *pCount, VkExtensionProperties* pProperties) { return util_GetExtensionProperties(0, NULL, pCount, pProperties); } -VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalLayerProperties(uint32_t *pCount, VkLayerProperties* pProperties) +VK_LAYER_EXPORT VkResult VKAPI vkEnumerateInstanceLayerProperties(uint32_t *pCount, VkLayerProperties* pProperties) { return util_GetLayerProperties(ARRAY_SIZE(globalLayerProps), globalLayerProps, pCount, pProperties); } |