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
diff --git a/loader/README.md b/loader/README.md
index 5878685..b8840d2 100644
--- a/loader/README.md
+++ b/loader/README.md
@@ -25,7 +25,7 @@
## Interface to driver (ICD)
- vkCreateInstance exported
-- vkGetGlobalExtensionProperties exported
+- vkEnumerateInstanceExtensionProperties exported
- vkGetDeviceProcAddr exported and returns valid function pointers for all the VK API entrypoints
- vkGetInstanceProcAddr exported and returns valid function pointers for all the VK API entrypoints
- all objects created by ICD can be cast to (VK\_LAYER\_DISPATCH\_TABLE \*\*)
diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h
index fe6449a..1581d81 100644
--- a/loader/gpa_helper.h
+++ b/loader/gpa_helper.h
@@ -57,14 +57,14 @@
return (void*) vkCreateDevice;
if (!strcmp(name, "DestroyDevice"))
return (void*) vkDestroyDevice;
- if (!strcmp(name, "GetGlobalExtensionProperties"))
- return (void*) vkGetGlobalExtensionProperties;
- if (!strcmp(name, "GetPhysicalDeviceExtensionProperties"))
- return (void*) vkGetPhysicalDeviceExtensionProperties;
- if (!strcmp(name, "GetGlobalLayerProperties"))
- return (void*) vkGetGlobalLayerProperties;
- if (!strcmp(name, "GetPhysicalDeviceLayerProperties"))
- return (void*) vkGetPhysicalDeviceLayerProperties;
+ if (!strcmp(name, "EnumerateInstanceExtensionProperties"))
+ return (void*) vkEnumerateInstanceExtensionProperties;
+ if (!strcmp(name, "EnumerateDeviceExtensionProperties"))
+ return (void*) vkEnumerateDeviceExtensionProperties;
+ if (!strcmp(name, "EnumerateInstanceLayerProperties"))
+ return (void*) vkEnumerateInstanceLayerProperties;
+ if (!strcmp(name, "EnumerateDeviceLayerProperties"))
+ return (void*) vkEnumerateDeviceLayerProperties;
if (!strcmp(name, "GetDeviceQueue"))
return (void*) vkGetDeviceQueue;
if (!strcmp(name, "QueueSubmit"))
@@ -378,10 +378,10 @@
return (void*) vkGetDeviceProcAddr;
if (!strcmp(name, "CreateDevice"))
return (void*) vkCreateDevice;
- if (!strcmp(name, "GetPhysicalDeviceExtensionProperties"))
- return (void*) vkGetPhysicalDeviceExtensionProperties;
- if (!strcmp(name, "GetPhysicalDeviceLayerProperties"))
- return (void*) vkGetPhysicalDeviceLayerProperties;
+ if (!strcmp(name, "EnumerateDeviceExtensionProperties"))
+ return (void*) vkEnumerateDeviceExtensionProperties;
+ if (!strcmp(name, "EnumerateDeviceLayerProperties"))
+ return (void*) vkEnumerateDeviceLayerProperties;
if (!strcmp(name, "GetDeviceQueue"))
return (void*) vkGetDeviceQueue;
if (!strcmp(name, "CreateCommandBuffer"))
diff --git a/loader/loader.c b/loader/loader.c
index 09de9ee..29f8e95 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -98,8 +98,8 @@
.GetPhysicalDeviceProperties = loader_GetPhysicalDeviceProperties,
.GetPhysicalDeviceQueueFamilyProperties = loader_GetPhysicalDeviceQueueFamilyProperties,
.GetPhysicalDeviceMemoryProperties = loader_GetPhysicalDeviceMemoryProperties,
- .GetPhysicalDeviceExtensionProperties = loader_GetPhysicalDeviceExtensionProperties,
- .GetPhysicalDeviceLayerProperties = loader_GetPhysicalDeviceLayerProperties,
+ .EnumerateDeviceExtensionProperties = loader_EnumerateDeviceExtensionProperties,
+ .EnumerateDeviceLayerProperties = loader_EnumerateDeviceLayerProperties,
.GetPhysicalDeviceSparseImageFormatProperties = loader_GetPhysicalDeviceSparseImageFormatProperties,
.GetPhysicalDeviceSurfaceSupportKHR = loader_GetPhysicalDeviceSurfaceSupportKHR,
.DbgCreateMsgCallback = loader_DbgCreateMsgCallback,
@@ -447,7 +447,7 @@
static void loader_add_global_extensions(
const struct loader_instance *inst,
- const PFN_vkGetGlobalExtensionProperties fp_get_props,
+ const PFN_vkEnumerateInstanceExtensionProperties fp_get_props,
const char *lib_name,
struct loader_extension_list *ext_list)
{
@@ -456,7 +456,7 @@
VkResult res;
if (!fp_get_props) {
- /* No GetGlobalExtensionProperties defined */
+ /* No EnumerateInstanceExtensionProperties defined */
return;
}
@@ -497,7 +497,7 @@
static void loader_add_physical_device_extensions(
const struct loader_instance *inst,
- PFN_vkGetPhysicalDeviceExtensionProperties get_phys_dev_ext_props,
+ PFN_vkEnumerateDeviceExtensionProperties get_phys_dev_ext_props,
VkPhysicalDevice physical_device,
const char *lib_name,
struct loader_extension_list *ext_list)
@@ -507,7 +507,7 @@
VkExtensionProperties *ext_props;
if (!get_phys_dev_ext_props) {
- /* No GetPhysicalDeviceExtensionProperties defined */
+ /* No EnumerateDeviceExtensionProperties defined */
return;
}
@@ -870,7 +870,7 @@
// traverse scanned icd list adding non-duplicate extensions to the list
for (uint32_t i = 0; i < icd_libs->count; i++) {
loader_init_ext_list(inst, &icd_exts);
- loader_add_global_extensions(inst, icd_libs->list[i].GetGlobalExtensionProperties,
+ loader_add_global_extensions(inst, icd_libs->list[i].EnumerateInstanceExtensionProperties,
icd_libs->list[i].lib_name,
&icd_exts);
loader_add_to_ext_list(inst, inst_exts,
@@ -1037,7 +1037,7 @@
{
loader_platform_dl_handle handle;
PFN_vkCreateInstance fp_create_inst;
- PFN_vkGetGlobalExtensionProperties fp_get_global_ext_props;
+ PFN_vkEnumerateInstanceExtensionProperties fp_get_global_ext_props;
PFN_vkGetInstanceProcAddr fp_get_proc_addr;
struct loader_scanned_icds *new_node;
@@ -1060,7 +1060,7 @@
LOOKUP_LD(fp_get_proc_addr, GetInstanceProcAddr);
LOOKUP_LD(fp_create_inst, CreateInstance);
- LOOKUP_LD(fp_get_global_ext_props, GetGlobalExtensionProperties);
+ LOOKUP_LD(fp_get_global_ext_props, EnumerateInstanceExtensionProperties);
#undef LOOKUP_LD
@@ -1080,7 +1080,7 @@
new_node->handle = handle;
new_node->GetInstanceProcAddr = fp_get_proc_addr;
new_node->CreateInstance = fp_create_inst;
- new_node->GetGlobalExtensionProperties = fp_get_global_ext_props;
+ new_node->EnumerateInstanceExtensionProperties = fp_get_global_ext_props;
new_node->lib_name = (char *) loader_heap_alloc(inst,
strlen(filename) + 1,
@@ -1118,7 +1118,7 @@
LOOKUP_GIPA(GetPhysicalDeviceProperties, true);
LOOKUP_GIPA(GetPhysicalDeviceMemoryProperties, true);
LOOKUP_GIPA(GetPhysicalDeviceQueueFamilyProperties, true);
- LOOKUP_GIPA(GetPhysicalDeviceExtensionProperties, true);
+ LOOKUP_GIPA(EnumerateDeviceExtensionProperties, true);
LOOKUP_GIPA(GetPhysicalDeviceSparseImageFormatProperties, true);
LOOKUP_GIPA(DbgCreateMsgCallback, false);
LOOKUP_GIPA(DbgDestroyMsgCallback, false);
@@ -2742,7 +2742,7 @@
loader_add_physical_device_extensions(
ptr_instance,
- icd->GetPhysicalDeviceExtensionProperties,
+ icd->EnumerateDeviceExtensionProperties,
icd->gpus[0],
icd->this_icd_lib->lib_name,
&icd->device_extension_cache[i]);
@@ -3081,7 +3081,7 @@
return loader_GetDeviceProcAddr(device, pName);
}
-LOADER_EXPORT VkResult VKAPI vkGetGlobalExtensionProperties(
+LOADER_EXPORT VkResult VKAPI vkEnumerateInstanceExtensionProperties(
const char* pLayerName,
uint32_t* pCount,
VkExtensionProperties* pProperties)
@@ -3149,7 +3149,7 @@
return VK_SUCCESS;
}
-LOADER_EXPORT VkResult VKAPI vkGetGlobalLayerProperties(
+LOADER_EXPORT VkResult VKAPI vkEnumerateInstanceLayerProperties(
uint32_t* pCount,
VkLayerProperties* pProperties)
{
@@ -3190,7 +3190,7 @@
return VK_SUCCESS;
}
-VkResult VKAPI loader_GetPhysicalDeviceExtensionProperties(
+VkResult VKAPI loader_EnumerateDeviceExtensionProperties(
VkPhysicalDevice gpu,
const char* pLayerName,
uint32_t* pCount,
@@ -3237,7 +3237,7 @@
return VK_SUCCESS;
}
-VkResult VKAPI loader_GetPhysicalDeviceLayerProperties(
+VkResult VKAPI loader_EnumerateDeviceLayerProperties(
VkPhysicalDevice gpu,
uint32_t* pCount,
VkLayerProperties* pProperties)
diff --git a/loader/loader.h b/loader/loader.h
index 19711d9..e344fc2 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -139,7 +139,7 @@
PFN_vkGetPhysicalDeviceProperties GetPhysicalDeviceProperties;
PFN_vkGetPhysicalDeviceQueueFamilyProperties GetPhysicalDeviceQueueFamilyProperties;
PFN_vkGetPhysicalDeviceMemoryProperties GetPhysicalDeviceMemoryProperties;
- PFN_vkGetPhysicalDeviceExtensionProperties GetPhysicalDeviceExtensionProperties;
+ PFN_vkEnumerateDeviceExtensionProperties EnumerateDeviceExtensionProperties;
PFN_vkGetPhysicalDeviceSparseImageFormatProperties GetPhysicalDeviceSparseImageFormatProperties;
PFN_vkDbgCreateMsgCallback DbgCreateMsgCallback;
PFN_vkDbgDestroyMsgCallback DbgDestroyMsgCallback;
@@ -148,7 +148,7 @@
/*
* Fill in the cache of available device extensions from
* this physical device. This cache will be used to satisfy
- * calls to GetPhysicalDeviceExtensionProperties
+ * calls to EnumerateDeviceExtensionProperties
*/
struct loader_extension_list device_extension_cache[MAX_GPUS_PER_ICD];
struct loader_icd *next;
@@ -207,7 +207,7 @@
PFN_vkGetInstanceProcAddr GetInstanceProcAddr;
PFN_vkCreateInstance CreateInstance;
- PFN_vkGetGlobalExtensionProperties GetGlobalExtensionProperties;
+ PFN_vkEnumerateInstanceExtensionProperties EnumerateInstanceExtensionProperties;
};
static inline struct loader_instance *loader_instance(VkInstance instance) {
@@ -309,11 +309,11 @@
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties* pProperties);
-VkResult VKAPI loader_GetPhysicalDeviceExtensionProperties (VkPhysicalDevice physicalDevice,
+VkResult VKAPI loader_EnumerateDeviceExtensionProperties (VkPhysicalDevice physicalDevice,
const char *pLayerName, uint32_t *pCount,
VkExtensionProperties* pProperties);
-VkResult VKAPI loader_GetPhysicalDeviceLayerProperties (VkPhysicalDevice physicalDevice,
+VkResult VKAPI loader_EnumerateDeviceLayerProperties (VkPhysicalDevice physicalDevice,
uint32_t *pCount,
VkLayerProperties* pProperties);
diff --git a/loader/table_ops.h b/loader/table_ops.h
index 8c3920e..c27cd4a 100644
--- a/loader/table_ops.h
+++ b/loader/table_ops.h
@@ -497,8 +497,8 @@
table->GetPhysicalDeviceProperties = (PFN_vkGetPhysicalDeviceProperties) gpa(inst, "vkGetPhysicalDeviceProperties");
table->GetPhysicalDeviceQueueFamilyProperties = (PFN_vkGetPhysicalDeviceQueueFamilyProperties) gpa(inst, "vkGetPhysicalDeviceQueueFamilyProperties");
table->GetPhysicalDeviceMemoryProperties = (PFN_vkGetPhysicalDeviceMemoryProperties) gpa(inst, "vkGetPhysicalDeviceMemoryProperties");
- table->GetPhysicalDeviceExtensionProperties = (PFN_vkGetPhysicalDeviceExtensionProperties) gpa(inst, "vkGetPhysicalDeviceExtensionProperties");
- table->GetPhysicalDeviceLayerProperties = (PFN_vkGetPhysicalDeviceLayerProperties) gpa(inst, "vkGetPhysicalDeviceLayerProperties");
+ table->EnumerateDeviceExtensionProperties = (PFN_vkEnumerateDeviceExtensionProperties) gpa(inst, "vkEnumerateDeviceExtensionProperties");
+ table->EnumerateDeviceLayerProperties = (PFN_vkEnumerateDeviceLayerProperties) gpa(inst, "vkEnumerateDeviceLayerProperties");
}
static inline void loader_init_instance_extension_dispatch_table(
@@ -541,10 +541,10 @@
return (void *) table->GetPhysicalDeviceMemoryProperties;
if (!strcmp(name, "GetInstanceProcAddr"))
return (void *) table->GetInstanceProcAddr;
- if (!strcmp(name, "GetPhysicalDeviceExtensionProperties"))
- return (void *) table->GetPhysicalDeviceExtensionProperties;
- if (!strcmp(name, "GetPhysicalDeviceLayerProperties"))
- return (void *) table->GetPhysicalDeviceLayerProperties;
+ if (!strcmp(name, "EnumerateDeviceExtensionProperties"))
+ return (void *) table->EnumerateDeviceExtensionProperties;
+ if (!strcmp(name, "EnumerateDeviceLayerProperties"))
+ return (void *) table->EnumerateDeviceLayerProperties;
if (!strcmp(name, "GetPhysicalDeviceSurfaceSupportKHR"))
return (void *) table->GetPhysicalDeviceSurfaceSupportKHR;
if (!strcmp(name, "DbgCreateMsgCallback"))
diff --git a/loader/trampoline.c b/loader/trampoline.c
index 7ebdfe4..b1a8390 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -313,7 +313,7 @@
loader_platform_thread_unlock_mutex(&loader_lock);
}
-LOADER_EXPORT VkResult VKAPI vkGetPhysicalDeviceExtensionProperties(
+LOADER_EXPORT VkResult VKAPI vkEnumerateDeviceExtensionProperties(
VkPhysicalDevice physicalDevice,
const char* pLayerName,
uint32_t* pCount,
@@ -323,12 +323,12 @@
loader_platform_thread_lock_mutex(&loader_lock);
//TODO convert over to using instance chain dispatch
- res = loader_GetPhysicalDeviceExtensionProperties(physicalDevice, pLayerName, pCount, pProperties);
+ res = loader_EnumerateDeviceExtensionProperties(physicalDevice, pLayerName, pCount, pProperties);
loader_platform_thread_unlock_mutex(&loader_lock);
return res;
}
-LOADER_EXPORT VkResult VKAPI vkGetPhysicalDeviceLayerProperties(
+LOADER_EXPORT VkResult VKAPI vkEnumerateDeviceLayerProperties(
VkPhysicalDevice physicalDevice,
uint32_t* pCount,
VkLayerProperties* pProperties)
@@ -337,7 +337,7 @@
loader_platform_thread_lock_mutex(&loader_lock);
//TODO convert over to using instance chain dispatch
- res = loader_GetPhysicalDeviceLayerProperties(physicalDevice, pCount, pProperties);
+ res = loader_EnumerateDeviceLayerProperties(physicalDevice, pCount, pProperties);
loader_platform_thread_unlock_mutex(&loader_lock);
return res;
}