scripts: Have legact genvk point to new script

Author: spencer-lunarg

scripts/generate_source.py

@@ -37,7 +37,7 @@
 # the Registry has been imported. Yes this is awkward, but it was the least awkward way to make --verify work.
 generators = {}
 
-def RunGenerators(api: str, registry: str, directory: str, styleFile: str, targetFilter: str, caching: bool):
+def RunGenerators(api: str, registry: str, directory: str, styleFile: str, targetFilter: str, flatOutput: bool):
 
     try:
         common_codegen.RunShellCmd(f'clang-format --version')
@@ -130,7 +130,12 @@ def RunGenerators(api: str, registry: str, directory: str, styleFile: str, targe
         else:
             SetMergedApiNames(None)
 
-        outDirectory = os.path.abspath(os.path.join(directory, generators[target]['directory']))
+        # For people who want to generate all the files in a single director
+        if flatOutput:
+            outDirectory = os.path.abspath(os.path.join(directory))
+        else:
+            outDirectory = os.path.abspath(os.path.join(directory, generators[target]['directory']))
+
         options = BaseGeneratorOptions(
             customFileName  = target,
             customDirectory = outDirectory)
@@ -155,7 +160,7 @@ def RunGenerators(api: str, registry: str, directory: str, styleFile: str, targe
         reg.apiGen()
 
         # Run clang-format on the file
-        if has_clang_format:
+        if has_clang_format and styleFile:
             common_codegen.RunShellCmd(f'clang-format -i --style=file:{styleFile} {os.path.join(outDirectory, target)}')
 
 
@@ -182,7 +187,7 @@ def main(argv):
     group.add_argument('--target', nargs='+', help='only generate file names passed in')
     group.add_argument('-i', '--incremental', action='store_true', help='only update repo files that change')
     group.add_argument('-v', '--verify', action='store_true', help='verify repo files match generator output')
-    group.add_argument('--no-caching', action='store_true', help='Do not try to cache generator objects')
+    group.add_argument('-o', action='store', dest='directory', help='Create target and related files in specified directory')
     args = parser.parse_args(argv)
 
     repo_dir = common_codegen.repo_relative('.')
@@ -210,12 +215,13 @@ def main(argv):
         temp_obj = tempfile.TemporaryDirectory(prefix='loader_codegen_')
         temp_dir = temp_obj.name
         gen_dir = temp_dir
+    elif args.directory:
+        gen_dir = args.directory
     else:
         # generate directly in the repo
         gen_dir = repo_dir
 
-    caching = not args.no_caching
-    RunGenerators(api=args.api,registry=registry, directory=gen_dir, styleFile=style_file, targetFilter=args.target, caching=caching)
+    RunGenerators(api=args.api,registry=registry, directory=gen_dir, styleFile=style_file, targetFilter=args.target, flatOutput=False)
 
     # optional post-generation steps
     if args.verify:

scripts/loader_extension_generator.py

@@ -123,7 +123,7 @@ def generate(self):
 
         if self.filename == 'vk_loader_extensions.h':
             self.print_vk_loader_extensions_h(out)
-        elif self.filename == 'vk_loader_extensions.c':
+        elif  self.filename == 'vk_loader_extensions.c' or self.filename == 'vk_loader_extensions.c.inc':
             self.print_vk_loader_extensions_c(out)
         elif self.filename == 'vk_layer_dispatch_table.h':
             self.print_vk_layer_dispatch_table(out)
@@ -230,12 +230,12 @@ def DescribeBlock(self, command, current_block, out, custom_commands_string = '
                 return None
             elif command.version is not None:
                 if command.version != current_block:
-                    out.append(f'\n{indent}// ---- Core Vulkan 1.{command.version.name.split("_")[-1]}{custom_commands_string}\n')
+                    out.append(f"\n{indent}// ---- Core Vulkan 1.{command.version.name.split('_')[-1]}{custom_commands_string}\n")
                 return command.version
             else:
                 # don't repeat unless the first extension is different (while rest can vary)
                 if not isinstance(current_block, list) or current_block[0].name != command.extensions[0].name:
-                    out.append(f'\n{indent}// ---- {command.extensions[0].name if len(command.extensions) > 0 else ""} extension{custom_commands_string}\n')
+                    out.append(f"\n{indent}// ---- {command.extensions[0].name if len(command.extensions) > 0 else ''} extension{custom_commands_string}\n")
                 return command.extensions
         else:
             return current_block
@@ -707,7 +707,7 @@ def OutputLoaderLookupFunc(self, out):
                         current_block = self.DescribeBlock(command, current_block, out)
                         if len(command.extensions) == 0:
                             if cur_type == 'device':
-                                version_check = f'        if (dev->should_ignore_device_commands_from_newer_version && api_version < {command.version.nameApi if command.version else "VK_API_VERSION_1_0"}) return NULL;\n'
+                                version_check = f"        if (dev->should_ignore_device_commands_from_newer_version && api_version < {command.version.nameApi if command.version else 'VK_API_VERSION_1_0'}) return NULL;\n"
                             else:
                                 version_check = ''
 
@@ -1345,4 +1345,3 @@ def OutputInstantExtensionWhitelistArray(self, out):
             if extension.protect is not None:
                 out.append( f'#endif // {extension.protect}\n')
         out.append( '                                                  NULL };\n')
-