From ac47ee1be74fec99583dd5cdd451ca3db55cb91c Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Thu, 23 May 2024 15:04:08 +0100 Subject: [PATCH] meson: remove --depfile for aco_tests This isn't needed right now and probably doesn't work. glsl_scraper.py writes to the same depfile several times. Signed-off-by: Rhys Perry Reviewed-by: Dylan Baker Part-of: --- src/amd/compiler/tests/glsl_scraper.py | 5 ----- src/amd/compiler/tests/meson.build | 2 -- 2 files changed, 7 deletions(-) diff --git a/src/amd/compiler/tests/glsl_scraper.py b/src/amd/compiler/tests/glsl_scraper.py index 480a99e93ea..3167d7cf614 100644 --- a/src/amd/compiler/tests/glsl_scraper.py +++ b/src/amd/compiler/tests/glsl_scraper.py @@ -91,8 +91,6 @@ class Shader: if self.target_env: args += ['--target-env', self.target_env] args += ['-o', out_file.name, in_file.name] - if depfile is not None: - args.extend(['--depfile', depfile]) with subprocess.Popen(args, stdout = subprocess.PIPE, stderr = subprocess.PIPE, @@ -302,8 +300,6 @@ def parse_args(): default='glslangValidator', dest='glslang', help='Full path to the glslangValidator shader compiler.') - p.add_argument('--depfile', metavar='DEPFILE', default=None, action="store", - help="Where to have glslang write a depfile") p.add_argument('infile', metavar='INFILE') return p.parse_args() @@ -313,7 +309,6 @@ args = parse_args() infname = args.infile outfname = args.outfile glslang = args.glslang -depfile = args.depfile with open_file(infname, 'r') as infile: parser = Parser(infile) diff --git a/src/amd/compiler/tests/meson.build b/src/amd/compiler/tests/meson.build index 5a19fba41dd..11c04fc14ff 100644 --- a/src/amd/compiler/tests/meson.build +++ b/src/amd/compiler/tests/meson.build @@ -36,9 +36,7 @@ gen_spirv = generator( arguments : [ join_paths(meson.current_source_dir(), 'glsl_scraper.py'), '@INPUT@', '--with-glslang', prog_glslang.full_path(), '-o', '@OUTPUT@', - glslang_depfile, ], - depfile: '@BASENAME@-spriv.h.d', ) gen_spirv_files = gen_spirv.process(spirv_files)