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/demos/cube.c b/demos/cube.c
index 9edb8de..608c480 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -2228,18 +2228,18 @@
/* Look for validation layers */
VkBool32 validation_found = 0;
- err = vkGetGlobalLayerProperties(&instance_layer_count, NULL);
+ err = vkEnumerateInstanceLayerProperties(&instance_layer_count, NULL);
assert(!err);
instance_layers = malloc(sizeof(VkLayerProperties) * instance_layer_count);
- err = vkGetGlobalLayerProperties(&instance_layer_count, instance_layers);
+ err = vkEnumerateInstanceLayerProperties(&instance_layer_count, instance_layers);
assert(!err);
if (demo->validate) {
validation_found = demo_check_layers(ARRAY_SIZE(instance_validation_layers), instance_validation_layers,
instance_layer_count, instance_layers);
if (!validation_found) {
- ERR_EXIT("vkGetGlobalLayerProperties failed to find"
+ ERR_EXIT("vkEnumerateInstanceLayerProperties failed to find"
"required validation layer.\n\n"
"Please look at the Getting Started guide for additional "
"information.\n",
@@ -2248,13 +2248,13 @@
enabled_layer_count = ARRAY_SIZE(instance_validation_layers);
}
- err = vkGetGlobalExtensionProperties(NULL, &instance_extension_count, NULL);
+ err = vkEnumerateInstanceExtensionProperties(NULL, &instance_extension_count, NULL);
assert(!err);
VkBool32 WSIextFound = 0;
memset(extension_names, 0, sizeof(extension_names));
instance_extensions = malloc(sizeof(VkExtensionProperties) * instance_extension_count);
- err = vkGetGlobalExtensionProperties(NULL, &instance_extension_count, instance_extensions);
+ err = vkEnumerateInstanceExtensionProperties(NULL, &instance_extension_count, instance_extensions);
assert(!err);
for (uint32_t i = 0; i < instance_extension_count; i++) {
if (!strcmp("VK_EXT_KHR_swapchain", instance_extensions[i].extName)) {
@@ -2269,7 +2269,7 @@
assert(enabled_extension_count < 64);
}
if (!WSIextFound) {
- ERR_EXIT("vkGetGlobalExtensionProperties failed to find the "
+ ERR_EXIT("vkEnumerateInstanceExtensionProperties failed to find the "
"\"VK_EXT_KHR_swapchain\" extension.\n\nDo you have a compatible "
"Vulkan installable client driver (ICD) installed?\nPlease "
"look at the Getting Started guide for additional "
@@ -2336,18 +2336,18 @@
validation_found = 0;
enabled_layer_count = 0;
uint32_t device_layer_count = 0;
- err = vkGetPhysicalDeviceLayerProperties(demo->gpu, &device_layer_count, NULL);
+ err = vkEnumerateDeviceLayerProperties(demo->gpu, &device_layer_count, NULL);
assert(!err);
device_layers = malloc(sizeof(VkLayerProperties) * device_layer_count);
- err = vkGetPhysicalDeviceLayerProperties(demo->gpu, &device_layer_count, device_layers);
+ err = vkEnumerateDeviceLayerProperties(demo->gpu, &device_layer_count, device_layers);
assert(!err);
if (demo->validate) {
validation_found = demo_check_layers(ARRAY_SIZE(device_validation_layers), device_validation_layers,
device_layer_count, device_layers);
if (!validation_found) {
- ERR_EXIT("vkGetPhysicalDeviceLayerProperties failed to find"
+ ERR_EXIT("vkEnumerateDeviceLayerProperties failed to find"
"a required validation layer.\n\n"
"Please look at the Getting Started guide for additional "
"information.\n",
@@ -2358,7 +2358,7 @@
uint32_t device_extension_count = 0;
VkExtensionProperties *device_extensions = NULL;
- err = vkGetPhysicalDeviceExtensionProperties(
+ err = vkEnumerateDeviceExtensionProperties(
demo->gpu, NULL, &device_extension_count, NULL);
assert(!err);
@@ -2366,7 +2366,7 @@
enabled_extension_count = 0;
memset(extension_names, 0, sizeof(extension_names));
device_extensions = malloc(sizeof(VkExtensionProperties) * device_extension_count);
- err = vkGetPhysicalDeviceExtensionProperties(
+ err = vkEnumerateDeviceExtensionProperties(
demo->gpu, NULL, &device_extension_count, device_extensions);
assert(!err);
@@ -2378,7 +2378,7 @@
assert(enabled_extension_count < 64);
}
if (!WSIextFound) {
- ERR_EXIT("vkGetPhysicalDeviceExtensionProperties failed to find the "
+ ERR_EXIT("vkEnumerateDeviceExtensionProperties failed to find the "
"\"VK_EXT_KHR_device_swapchain\" extension.\n\nDo you have a compatible "
"Vulkan installable client driver (ICD) installed?\nPlease "
"look at the Getting Started guide for additional "
diff --git a/demos/tri.c b/demos/tri.c
index 78a5712..8aa942e 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -1749,18 +1749,18 @@
/* Look for validation layers */
VkBool32 validation_found = 0;
- err = vkGetGlobalLayerProperties(&instance_layer_count, NULL);
+ err = vkEnumerateInstanceLayerProperties(&instance_layer_count, NULL);
assert(!err);
instance_layers = malloc(sizeof(VkLayerProperties) * instance_layer_count);
- err = vkGetGlobalLayerProperties(&instance_layer_count, instance_layers);
+ err = vkEnumerateInstanceLayerProperties(&instance_layer_count, instance_layers);
assert(!err);
if (demo->validate) {
validation_found = demo_check_layers(ARRAY_SIZE(instance_validation_layers), instance_validation_layers,
instance_layer_count, instance_layers);
if (!validation_found) {
- ERR_EXIT("vkGetGlobalLayerProperties failed to find"
+ ERR_EXIT("vkEnumerateInstanceLayerProperties failed to find"
"required validation layer.\n\n"
"Please look at the Getting Started guide for additional "
"information.\n",
@@ -1769,13 +1769,13 @@
enabled_layer_count = ARRAY_SIZE(instance_validation_layers);
}
- err = vkGetGlobalExtensionProperties(NULL, &instance_extension_count, NULL);
+ err = vkEnumerateInstanceExtensionProperties(NULL, &instance_extension_count, NULL);
assert(!err);
VkBool32 WSIextFound = 0;
memset(extension_names, 0, sizeof(extension_names));
instance_extensions = malloc(sizeof(VkExtensionProperties) * instance_extension_count);
- err = vkGetGlobalExtensionProperties(NULL, &instance_extension_count, instance_extensions);
+ err = vkEnumerateInstanceExtensionProperties(NULL, &instance_extension_count, instance_extensions);
assert(!err);
for (uint32_t i = 0; i < instance_extension_count; i++) {
if (!strcmp("VK_EXT_KHR_swapchain", instance_extensions[i].extName)) {
@@ -1790,7 +1790,7 @@
assert(enabled_extension_count < 64);
}
if (!WSIextFound) {
- ERR_EXIT("vkGetGlobalExtensionProperties failed to find the "
+ ERR_EXIT("vkEnumerateInstanceExtensionProperties failed to find the "
"\"VK_EXT_KHR_swapchain\" extension.\n\nDo you have a compatible "
"Vulkan installable client driver (ICD) installed?\nPlease "
"look at the Getting Started guide for additional "
@@ -1861,18 +1861,18 @@
validation_found = 0;
enabled_layer_count = 0;
uint32_t device_layer_count = 0;
- err = vkGetPhysicalDeviceLayerProperties(demo->gpu, &device_layer_count, NULL);
+ err = vkEnumerateDeviceLayerProperties(demo->gpu, &device_layer_count, NULL);
assert(!err);
device_layers = malloc(sizeof(VkLayerProperties) * device_layer_count);
- err = vkGetPhysicalDeviceLayerProperties(demo->gpu, &device_layer_count, device_layers);
+ err = vkEnumerateDeviceLayerProperties(demo->gpu, &device_layer_count, device_layers);
assert(!err);
if (demo->validate) {
validation_found = demo_check_layers(ARRAY_SIZE(device_validation_layers), device_validation_layers,
device_layer_count, device_layers);
if (!validation_found) {
- ERR_EXIT("vkGetPhysicalDeviceLayerProperties failed to find"
+ ERR_EXIT("vkEnumerateDeviceLayerProperties failed to find"
"a required validation layer.\n\n"
"Please look at the Getting Started guide for additional "
"information.\n",
@@ -1883,7 +1883,7 @@
uint32_t device_extension_count = 0;
VkExtensionProperties *device_extensions = NULL;
- err = vkGetPhysicalDeviceExtensionProperties(
+ err = vkEnumerateDeviceExtensionProperties(
demo->gpu, NULL, &device_extension_count, NULL);
assert(!err);
@@ -1891,7 +1891,7 @@
enabled_extension_count = 0;
memset(extension_names, 0, sizeof(extension_names));
device_extensions = malloc(sizeof(VkExtensionProperties) * device_extension_count);
- err = vkGetPhysicalDeviceExtensionProperties(
+ err = vkEnumerateDeviceExtensionProperties(
demo->gpu, NULL, &device_extension_count, device_extensions);
assert(!err);
@@ -1903,7 +1903,7 @@
assert(enabled_extension_count < 64);
}
if (!WSIextFound) {
- ERR_EXIT("vkGetPhysicalDeviceExtensionProperties failed to find the "
+ ERR_EXIT("vkEnumerateDeviceExtensionProperties failed to find the "
"\"VK_EXT_KHR_device_swapchain\" extension.\n\nDo you have a compatible "
"Vulkan installable client driver (ICD) installed?\nPlease "
"look at the Getting Started guide for additional "
diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c
index f560533..234dbba 100644
--- a/demos/vulkaninfo.c
+++ b/demos/vulkaninfo.c
@@ -376,14 +376,14 @@
/* repeat get until VK_INCOMPLETE goes away */
do {
- err = vkGetPhysicalDeviceExtensionProperties(gpu->obj, layer_name, &ext_count, NULL);
+ err = vkEnumerateDeviceExtensionProperties(gpu->obj, layer_name, &ext_count, NULL);
assert(!err);
if (ext_ptr) {
free(ext_ptr);
}
ext_ptr = malloc(ext_count * sizeof(VkExtensionProperties));
- err = vkGetPhysicalDeviceExtensionProperties(gpu->obj, layer_name, &ext_count, ext_ptr);
+ err = vkEnumerateDeviceExtensionProperties(gpu->obj, layer_name, &ext_count, ext_ptr);
} while (err == VK_INCOMPLETE);
assert(!err);
@@ -416,7 +416,7 @@
struct layer_extension_list *device_layers = NULL;
do {
- err = vkGetPhysicalDeviceLayerProperties(gpu->obj, &count, NULL);
+ err = vkEnumerateDeviceLayerProperties(gpu->obj, &count, NULL);
assert(!err);
if (device_layer_properties) {
@@ -431,7 +431,7 @@
device_layers = malloc(sizeof(struct layer_extension_list) * count);
assert(device_layers);
- err = vkGetPhysicalDeviceLayerProperties(gpu->obj, &count, device_layer_properties);
+ err = vkEnumerateDeviceLayerProperties(gpu->obj, &count, device_layer_properties);
} while (err == VK_INCOMPLETE);
assert(!err);
@@ -510,14 +510,14 @@
/* repeat get until VK_INCOMPLETE goes away */
do {
- err = vkGetGlobalExtensionProperties(layer_name, &ext_count, NULL);
+ err = vkEnumerateInstanceExtensionProperties(layer_name, &ext_count, NULL);
assert(!err);
if (ext_ptr) {
free(ext_ptr);
}
ext_ptr = malloc(ext_count * sizeof(VkExtensionProperties));
- err = vkGetGlobalExtensionProperties(layer_name, &ext_count, ext_ptr);
+ err = vkEnumerateInstanceExtensionProperties(layer_name, &ext_count, ext_ptr);
} while (err == VK_INCOMPLETE);
assert(!err);
@@ -560,7 +560,7 @@
struct layer_extension_list *global_layers = NULL;
do {
- err = vkGetGlobalLayerProperties(&count, NULL);
+ err = vkEnumerateInstanceLayerProperties(&count, NULL);
assert(!err);
if (global_layer_properties) {
@@ -575,7 +575,7 @@
global_layers = malloc(sizeof(struct layer_extension_list) * count);
assert(global_layers);
- err = vkGetGlobalLayerProperties(&count, global_layer_properties);
+ err = vkEnumerateInstanceLayerProperties(&count, global_layer_properties);
} while (err == VK_INCOMPLETE);
assert(!err);