aboutsummaryrefslogtreecommitdiff
path: root/layers
diff options
context:
space:
mode:
Diffstat (limited to 'layers')
-rw-r--r--layers/README.md2
-rw-r--r--layers/basic.cpp16
-rw-r--r--layers/device_limits.cpp24
-rw-r--r--layers/draw_state.cpp24
-rw-r--r--layers/image.cpp24
-rw-r--r--layers/mem_tracker.cpp24
-rw-r--r--layers/param_checker.cpp24
-rw-r--r--layers/screenshot.cpp8
-rw-r--r--layers/shader_checker.cpp16
9 files changed, 81 insertions, 81 deletions
diff --git a/layers/README.md b/layers/README.md
index 8a1754c2..2dabf4a7 100644
--- a/layers/README.md
+++ b/layers/README.md
@@ -6,7 +6,7 @@ Layer libraries can be written to intercept or hook VK entry points for various
debug and validation purposes. One or more VK entry points can be defined in your Layer
library. Undefined entrypoints in the Layer library will be passed to the next Layer which
may be the driver. Multiple layer libraries can be chained (actually a hierarchy) together.
-vkGetGlobalLayerProperties and vkGetPhysicalDeviceLayerProperties can be called to list the
+vkEnumerateInstanceLayerProperties and vkEnumerateDeviceLayerProperties can be called to list the
available layers and their properties. Layers can intercept Vulkan instance level entry points
in which case they are called an Instance Layer. Layers can intercept device entry points
in which case they are called a Device Layer. Instance level entry points are those with VkInstance
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);
}
diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp
index 9489eb62..e242f8cc 100644
--- a/layers/device_limits.cpp
+++ b/layers/device_limits.cpp
@@ -343,7 +343,7 @@ static const VkLayerProperties ds_global_layers[] = {
}
};
-VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionProperties(
+VK_LAYER_EXPORT VkResult VKAPI vkEnumerateInstanceExtensionProperties(
const char *pLayerName,
uint32_t *pCount,
VkExtensionProperties* pProperties)
@@ -352,7 +352,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)
{
@@ -377,7 +377,7 @@ static const VkLayerProperties ds_device_layers[] = {
}
};
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceExtensionProperties(
+VK_LAYER_EXPORT VkResult VKAPI vkEnumerateDeviceExtensionProperties(
VkPhysicalDevice physicalDevice,
const char* pLayerName,
uint32_t* pCount,
@@ -388,7 +388,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceExtensionProperties(
pCount, pProperties);
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceLayerProperties(
+VK_LAYER_EXPORT VkResult VKAPI vkEnumerateDeviceLayerProperties(
VkPhysicalDevice physicalDevice,
uint32_t* pCount,
VkLayerProperties* pProperties)
@@ -685,16 +685,16 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetInstanceProcAddr(VkInstance instan
return (PFN_vkVoidFunction) vkGetPhysicalDeviceQueueFamilyProperties;
if (!strcmp(funcName, "vkGetPhysicalDeviceMemoryProperties"))
return (PFN_vkVoidFunction) vkGetPhysicalDeviceMemoryProperties;
- if (!strcmp(funcName, "vkGetPhysicalDeviceLayerProperties"))
- return (PFN_vkVoidFunction) vkGetPhysicalDeviceLayerProperties;
- if (!strcmp(funcName, "vkGetPhysicalDeviceExtensionProperties"))
- return (PFN_vkVoidFunction) vkGetPhysicalDeviceExtensionProperties;
+ if (!strcmp(funcName, "vkEnumerateDeviceLayerProperties"))
+ return (PFN_vkVoidFunction) vkEnumerateDeviceLayerProperties;
+ if (!strcmp(funcName, "vkEnumerateDeviceExtensionProperties"))
+ return (PFN_vkVoidFunction) vkEnumerateDeviceExtensionProperties;
if (!strcmp(funcName, "vkGetPhysicalDeviceSparseImageFormatProperties"))
return (PFN_vkVoidFunction) vkGetPhysicalDeviceSparseImageFormatProperties;
- if (!strcmp(funcName, "vkGetGlobalLayerProperties"))
- return (PFN_vkVoidFunction) vkGetGlobalLayerProperties;
- if (!strcmp(funcName, "vkGetGlobalExtensionProperties"))
- return (PFN_vkVoidFunction) vkGetGlobalExtensionProperties;
+ if (!strcmp(funcName, "vkEnumerateInstanceLayerProperties"))
+ return (PFN_vkVoidFunction) vkEnumerateInstanceLayerProperties;
+ if (!strcmp(funcName, "vkEnumerateInstanceExtensionProperties"))
+ return (PFN_vkVoidFunction) vkEnumerateInstanceExtensionProperties;
layer_data *my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map);
fptr = debug_report_get_instance_proc_addr(my_data->report_data, funcName);
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index d7df9228..a831869a 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -1435,7 +1435,7 @@ static const VkLayerProperties ds_global_layers[] = {
}
};
-VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionProperties(
+VK_LAYER_EXPORT VkResult VKAPI vkEnumerateInstanceExtensionProperties(
const char *pLayerName,
uint32_t *pCount,
VkExtensionProperties* pProperties)
@@ -1444,7 +1444,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)
{
@@ -1469,7 +1469,7 @@ static const VkLayerProperties ds_device_layers[] = {
}
};
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceExtensionProperties(
+VK_LAYER_EXPORT VkResult VKAPI vkEnumerateDeviceExtensionProperties(
VkPhysicalDevice physicalDevice,
const char* pLayerName,
uint32_t* pCount,
@@ -1480,7 +1480,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceExtensionProperties(
pCount, pProperties);
}
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceLayerProperties(
+VK_LAYER_EXPORT VkResult VKAPI vkEnumerateDeviceLayerProperties(
VkPhysicalDevice physicalDevice,
uint32_t* pCount,
VkLayerProperties* pProperties)
@@ -3420,14 +3420,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 *my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map);
fptr = debug_report_get_instance_proc_addr(my_data->report_data, funcName);
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);
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index f60754b5..0b2d7a61 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1463,7 +1463,7 @@ static const VkLayerProperties mtGlobalLayers[] = {
}
};
-VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionProperties(
+VK_LAYER_EXPORT VkResult VKAPI vkEnumerateInstanceExtensionProperties(
const char *pLayerName,
uint32_t *pCount,
VkExtensionProperties* pProperties)
@@ -1472,7 +1472,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)
{
@@ -1481,7 +1481,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,
@@ -1491,7 +1491,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)
@@ -3319,14 +3319,14 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetInstanceProcAddr(
return (PFN_vkVoidFunction) vkCreateInstance;
if (!strcmp(funcName, "vkGetPhysicalDeviceMemoryProperties"))
return (PFN_vkVoidFunction) vkGetPhysicalDeviceMemoryProperties;
- 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 *my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map);
fptr = debug_report_get_instance_proc_addr(my_data->report_data, funcName);
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 9fcf1192..74041192 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -135,7 +135,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)
@@ -144,7 +144,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)
{
@@ -153,7 +153,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,
@@ -163,7 +163,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)
@@ -7509,14 +7509,14 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetInstanceProcAddr(VkInstance instan
return (PFN_vkVoidFunction) vkGetPhysicalDeviceFeatures;
if (!strcmp(funcName, "vkGetPhysicalDeviceFormatProperties"))
return (PFN_vkVoidFunction) vkGetPhysicalDeviceFormatProperties;
- 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);
diff --git a/layers/screenshot.cpp b/layers/screenshot.cpp
index bc2b8208..70b10c19 100644
--- a/layers/screenshot.cpp
+++ b/layers/screenshot.cpp
@@ -387,7 +387,7 @@ static const VkLayerProperties ss_device_layers[] = {
}
};
-VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionProperties(
+VK_LAYER_EXPORT VkResult VKAPI vkEnumerateInstanceExtensionProperties(
const char *pLayerName,
uint32_t *pCount,
VkExtensionProperties* pProperties)
@@ -396,7 +396,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)
{
@@ -405,7 +405,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,
@@ -415,7 +415,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)
diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp
index fbaf0a4e..632947ab 100644
--- a/layers/shader_checker.cpp
+++ b/layers/shader_checker.cpp
@@ -240,7 +240,7 @@ static const VkLayerProperties shader_checker_global_layers[] = {
}
};
-VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionProperties(
+VK_LAYER_EXPORT VkResult VKAPI vkEnumerateInstanceExtensionProperties(
const char *pLayerName,
uint32_t *pCount,
VkExtensionProperties* pProperties)
@@ -249,7 +249,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)
{
@@ -258,7 +258,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,
@@ -268,7 +268,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)
@@ -1117,10 +1117,10 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetInstanceProcAddr(VkInstance instan
ADD_HOOK(vkCreateInstance);
ADD_HOOK(vkDestroyInstance);
- ADD_HOOK(vkGetGlobalExtensionProperties);
- ADD_HOOK(vkGetPhysicalDeviceExtensionProperties);
- ADD_HOOK(vkGetGlobalLayerProperties);
- ADD_HOOK(vkGetPhysicalDeviceLayerProperties);
+ ADD_HOOK(vkEnumerateInstanceExtensionProperties);
+ ADD_HOOK(vkEnumerateDeviceExtensionProperties);
+ ADD_HOOK(vkEnumerateInstanceLayerProperties);
+ ADD_HOOK(vkEnumerateDeviceLayerProperties);
#undef ADD_HOOK
generated by cgit v1.2.3 (git 2.39.1) at 2026-05-05 00:12:54 +0000