Merge branch 'dev/jerrans/depfile-fix' into 'main'

Fix for shaders not rebuilding and spirv-val full path

See merge request lightspeedrtx/dxvk-remix-nv!1605

Author: jerrans

meson.build

@@ -250,6 +250,7 @@ endif
 # Shader Compile Tools
 glsl_compiler = find_program('external/glslangvalidator/glslangValidator')
 slang_compiler = find_program('external/slang/slangc')
+spirv_val = find_program('external/spirv_tools/spirv-val')
 python_interpreter = find_program('python3', 'python')
 shader_compile_script = join_paths(global_src_root_norm, 'scripts-common/compile_shaders.py')
 
@@ -307,6 +308,7 @@ rtx_shaders_command_arguments = [
   # See this for more info: https://mesonbuild.com/Reference-manual_returned_external_program.html#external_programfull_path
   '-glslang', fs.as_posix(glsl_compiler.full_path()),
   '-slangc', fs.as_posix(slang_compiler.full_path()),
+  '-spirvval', fs.as_posix(spirv_val.full_path()),
   '-input', rtx_shader_source_directory,
   '-include', shader_directory,
   '-include', rtxdi_include_path_string,

scripts-common/compile_shaders.py

@@ -25,6 +25,7 @@ def sigint_handler(signal, frame):
 parser = argparse.ArgumentParser(description='Compiles DXVK-RT shaders.')
 parser.add_argument('-glslang', required=True, type=str, dest='glslang')
 parser.add_argument('-slangc', required=True, type=str, dest='slangc')
+parser.add_argument('-spirvval', required=True, type=str, dest='spirvval')
 parser.add_argument('-input', required=False, type=str, dest='input', default='.')
 parser.add_argument('-I', '-include', action='append', type=str, dest='includes', default=[])
 parser.add_argument('-output', required=True, type=str, dest='output')
@@ -216,10 +217,9 @@ def createSlangTask(inputFile, variantSpec):
     variantName, variantType = os.path.splitext(variantSpec[0])
 
     variantDefines = ' '.join([f'-D{x}' for x in variantSpec[1:]])
-    glslFile = os.path.join(args.output, variantName + variantType)
     destFile = os.path.join(args.output, variantName + destExtension)
     depFile = os.path.join(args.output, variantName + ".d")
-    task = createBasicTask(inputFile, destFile, glslFile, depFile)
+    task = createBasicTask(inputFile, destFile, destFile, depFile)
 
     if variantName != inputName:
         task.customName = f'{os.path.basename(inputFile)} ({variantName})'
@@ -242,7 +242,7 @@ def createSlangTask(inputFile, variantSpec):
 
     script_dir = os.path.dirname(os.path.realpath(__file__))
     validate_shader_path = os.path.join(script_dir, 'validate_shader.py')
-    command2 = f'python {validate_shader_path} {destFile}'
+    command2 = f'python {validate_shader_path} -spirvval {args.spirvval} -input {destFile}'
     task.commands = [command1, command2]
 
     return task

scripts-common/validate_shader.py

@@ -3,6 +3,7 @@
 import re
 import struct
 import subprocess
+import argparse
 
 remove_temp_file = False
 
@@ -47,15 +48,16 @@ def validate_shader(path_to_shaders, shader_file):
         if remove_temp_file:
             os.remove(spv_file)
 
-if len(sys.argv) != 2:
-    print(sys.argv[0] + ' <path to spv files>')
-    exit(1)
+parser = argparse.ArgumentParser(description='Validates SPIRV shaders.')
+parser.add_argument('-spirvval', required=True, type=str, dest='spirvval')
+parser.add_argument('-input', required=True, type=str, dest='input')
+args = parser.parse_args()
 
 # path to spirv-val provided by a build of spirv-tools in packman
-spirv_val_path = os.path.join('..', 'external', 'spirv_tools', 'spirv-val.exe')
+spirv_val_path = args.spirvval
 if not os.path.exists(spirv_val_path):
-    print('spirv-val not found at ' + spirv_val_path)
+    print('spirv-val not found at ' + args.spirvval)
     exit(1)
 
-if sys.argv[1].endswith('.h') or sys.argv[1].endswith('.spv'):
-    validate_shader('', sys.argv[1])
+if args.input.endswith('.h') or args.input.endswith('.spv'):
+    validate_shader('', args.input)