From 3cbbb655d78ad16fa26ea7f838f0c19a1e2035a8 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Tue, 14 Nov 2017 10:19:40 -0700 Subject: scripts: Fix incorrect object type mappings 'Unknown' type was at the end of a couple of the lists, causing incorrect IDs to be emitted. Change-Id: I55cae6ecaff47977dca78e2f73468980f9450bda --- scripts/helper_file_generator.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/scripts/helper_file_generator.py b/scripts/helper_file_generator.py index a8e9f134..43ec4f44 100644 --- a/scripts/helper_file_generator.py +++ b/scripts/helper_file_generator.py @@ -697,8 +697,8 @@ class HelperFileOutputGenerator(OutputGenerator): object_types_header += '\n' object_types_header += '// Helper array to get Vulkan VK_EXT_debug_report object type enum from the internal layers version\n' object_types_header += 'const VkDebugReportObjectTypeEXT get_debug_report_enum[] = {\n' + object_types_header += ' VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // No Match\n' for object_type in type_list: - done = False search_type = object_type.replace("kVulkanObjectType", "").lower() for vk_object_type in self.debug_report_object_types: target_type = vk_object_type.replace("VK_DEBUG_REPORT_OBJECT_TYPE_", "").lower() @@ -706,28 +706,22 @@ class HelperFileOutputGenerator(OutputGenerator): target_type = target_type.replace("_", "") if search_type == target_type: object_types_header += ' %s, // %s\n' % (vk_object_type, object_type) - done = True break - if done == False: - object_types_header += ' VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // No Match\n' object_types_header += '};\n' # Output a conversion routine from the layer object definitions to the core object type definitions object_types_header += '\n' object_types_header += '// Helper array to get Official Vulkan VkObjectType enum from the internal layers version\n' object_types_header += 'const VkObjectType get_object_type_enum[] = {\n' + object_types_header += ' VK_OBJECT_TYPE_UNKNOWN, // No Match\n' for object_type in type_list: - done = False search_type = object_type.replace("kVulkanObjectType", "").lower() for vk_object_type in self.core_object_types: target_type = vk_object_type.replace("VK_OBJECT_TYPE_", "").lower() target_type = target_type.replace("_", "") if search_type == target_type: object_types_header += ' %s, // %s\n' % (vk_object_type, object_type) - done = True break - if done == False: - object_types_header += ' VK_OBJECT_TYPE_UNKNOWN, // No Match\n' object_types_header += '};\n' return object_types_header -- cgit v1.2.3