commit c6c7c0168f3047aae50ec77761db522dd79488ae
author Lenny Komow <lenny@lunarg.com> Mon Nov 12 21:57:05 2018
committer Lenny Komow <lenny@lunarg.com> Mon Nov 12 21:57:05 2018
tree 423586121d0e1cbf4f06b6c7d3b7d6ad66efb2b2
parent abe5c2b3c33e42fff883d32d4c168556fb29b3ba

loader: Fix VK_EXT_debug_utils handling

Change-Id: I2ba5e60639bd2a3f527746b8d5ca46989a701f4c

scripts/loader_extension_generator.py

diff --git a/scripts/loader_extension_generator.py b/scripts/loader_extension_generator.py
index 3b8aaac..286835a 100644
--- a/scripts/loader_extension_generator.py
+++ b/scripts/loader_extension_generator.py
@@ -487,8 +487,9 @@
                 commands = self.ext_commands
 
             for cur_cmd in commands:
+                is_instance_ext = x > 0 and cur_cmd.ext_type == 'instance'
                 is_inst_handle_type = cur_cmd.name in ADD_INST_CMDS or cur_cmd.handle_type == 'VkInstance' or cur_cmd.handle_type == 'VkPhysicalDevice'
-                if is_inst_handle_type:
+                if is_inst_handle_type or is_instance_ext:
 
                     if cur_cmd.ext_name != cur_extension_name:
                         if 'VK_VERSION_' in cur_cmd.ext_name:
@@ -847,8 +848,9 @@
                     commands = self.ext_commands
 
                 for cur_cmd in commands:
+                    is_instance_ext = x > 0 and cur_cmd.ext_type == 'instance'
                     is_inst_handle_type = cur_cmd.handle_type == 'VkInstance' or cur_cmd.handle_type == 'VkPhysicalDevice'
-                    if ((cur_type == 'instance' and is_inst_handle_type) or (cur_type == 'device' and not is_inst_handle_type)):
+                    if ((cur_type == 'instance' and is_inst_handle_type) or (cur_type == 'device' and not is_inst_handle_type) or is_instance_ext):
 
                         if cur_cmd.ext_name != cur_extension_name:
                             if 'VK_VERSION_' in cur_cmd.ext_name: