From cbe1aca68ced00a692d8a13f0b56c40519161c07 Mon Sep 17 00:00:00 2001 From: Jeremy Gebben Date: Tue, 5 Nov 2024 08:55:47 -0700 Subject: [PATCH] scripts: Make generate_source.py look harder for vk.xml Allow the registry path argument to also be the base directory containing the Vulkan-Headers repo (eg. ./external) to save redundant typing. --- scripts/generate_source.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/generate_source.py b/scripts/generate_source.py index 6c63f0c9d..70e138db0 100755 --- a/scripts/generate_source.py +++ b/scripts/generate_source.py @@ -76,6 +76,13 @@ def main(argv): for path in files_to_gen.keys(): os.makedirs(os.path.join(temp_dir, path)) + registry = os.path.abspath(os.path.join(args.registry, 'vk.xml')) + if not os.path.isfile(registry): + registry = os.path.abspath(os.path.join(args.registry, 'Vulkan-Headers/registry/vk.xml')) + if not os.path.isfile(registry): + print(f'cannot find vk.xml in {args.registry}') + return -1 + # run each code generator for path, filenames in files_to_gen.items(): for filename in filenames: @@ -86,7 +93,7 @@ def main(argv): cmd = [common_codegen.repo_relative(os.path.join('scripts','kvt_genvk.py')), '-api', args.api, - '-registry', os.path.abspath(os.path.join(args.registry, 'vk.xml')), + '-registry', registry, '-quiet', '-directory', output_path, filename] print(' '.join(cmd)) try: