scripts: Clarify some promoted extension var names
Codegen script used some confusing names for 1.0 extensions promoted
to core in 1.1.
Change-Id: I6e0ef6ec4cc1edfac71210a40d89739d4a757e44
diff --git a/layers/generated/vk_extension_helper.h b/layers/generated/vk_extension_helper.h
index 45f2456..f732611 100644
--- a/layers/generated/vk_extension_helper.h
+++ b/layers/generated/vk_extension_helper.h
@@ -185,7 +185,7 @@
uint32_t InitFromInstanceCreateInfo(uint32_t requested_api_version, const VkInstanceCreateInfo *pCreateInfo) {
- static const std::vector<const char *> V_1_0_promoted_instance_extensions = {
+ static const std::vector<const char *> V_1_1_promoted_instance_apis = {
VK_KHR_DEVICE_GROUP_CREATION_EXTENSION_NAME,
VK_KHR_EXTERNAL_FENCE_CAPABILITIES_EXTENSION_NAME,
VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME,
@@ -204,7 +204,7 @@
}
uint32_t api_version = NormalizeApiVersion(requested_api_version);
if (api_version >= VK_API_VERSION_1_1) {
- for (auto promoted_ext : V_1_0_promoted_instance_extensions) {
+ for (auto promoted_ext : V_1_1_promoted_instance_apis) {
auto info = get_info(promoted_ext);
assert(info.state);
if (info.state) this->*(info.state) = true;
@@ -720,7 +720,7 @@
*this = DeviceExtensions(*instance_extensions);
- static const std::vector<const char *> V_1_0_promoted_device_extensions = {
+ static const std::vector<const char *> V_1_1_promoted_device_apis = {
VK_KHR_16BIT_STORAGE_EXTENSION_NAME,
VK_KHR_BIND_MEMORY_2_EXTENSION_NAME,
VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME,
@@ -752,7 +752,7 @@
}
uint32_t api_version = NormalizeApiVersion(requested_api_version);
if (api_version >= VK_API_VERSION_1_1) {
- for (auto promoted_ext : V_1_0_promoted_device_extensions) {
+ for (auto promoted_ext : V_1_1_promoted_device_apis) {
auto info = get_info(promoted_ext);
assert(info.state);
if (info.state) this->*(info.state) = true;
diff --git a/scripts/helper_file_generator.py b/scripts/helper_file_generator.py
index ab48b22..42aeef3 100644
--- a/scripts/helper_file_generator.py
+++ b/scripts/helper_file_generator.py
@@ -492,7 +492,7 @@
'VK_VERSION_1_1',
]
- V_1_0_instance_extensions_promoted_to_core = [
+ V_1_0_instance_extensions_promoted_to_V_1_1_core = [
'vk_khr_device_group_creation',
'vk_khr_external_fence_capabilities',
'vk_khr_external_memory_capabilities',
@@ -500,7 +500,7 @@
'vk_khr_get_physical_device_properties_2',
]
- V_1_0_device_extensions_promoted_to_core = [
+ V_1_0_device_extensions_promoted_to_V_1_1_core = [
'vk_khr_16bit_storage',
'vk_khr_bind_memory_2',
'vk_khr_dedicated_allocation',
@@ -545,12 +545,12 @@
struct_type = '%sExtensions' % type
if type == 'Instance':
extension_dict = self.instance_extension_info
- promoted_ext_list = V_1_0_instance_extensions_promoted_to_core
+ promoted_ext_list = V_1_0_instance_extensions_promoted_to_V_1_1_core
struct_decl = 'struct %s {' % struct_type
instance_struct_type = struct_type
else:
extension_dict = self.device_extension_info
- promoted_ext_list = V_1_0_device_extensions_promoted_to_core
+ promoted_ext_list = V_1_0_device_extensions_promoted_to_V_1_1_core
struct_decl = 'struct %s : public %s {' % (struct_type, instance_struct_type)
extension_items = sorted(extension_dict.items())
@@ -639,7 +639,7 @@
'']),
struct.extend([
'',
- ' static const std::vector<const char *> V_1_0_promoted_%s_extensions = {' % type.lower() ])
+ ' static const std::vector<const char *> V_1_1_promoted_%s_apis = {' % type.lower() ])
struct.extend([' %s_EXTENSION_NAME,' % ext_name.upper() for ext_name in promoted_ext_list])
struct.extend([' "VK_VERSION_1_1",'])
struct.extend([
@@ -655,7 +655,7 @@
' }',
' uint32_t api_version = NormalizeApiVersion(requested_api_version);',
' if (api_version >= VK_API_VERSION_1_1) {',
- ' for (auto promoted_ext : V_1_0_promoted_%s_extensions) {' % type.lower(),
+ ' for (auto promoted_ext : V_1_1_promoted_%s_apis) {' % type.lower(),
' auto info = get_info(promoted_ext);',
' assert(info.state);',
' if (info.state) this->*(info.state) = true;',