Commit bd203b57 by Jamie Madill Committed by Commit Bot

Vulkan: Correct generated shader paths.

This was showing up as a GN error with a newer version of GN. Bug: angleproject:3792 Change-Id: I1993ccfe079c1768217f704cc9ba036ec67024bf Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1745226Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent c9ba782a
{ {
"src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py": "src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py":
"a528a53197ea6c8eaa3bb42a7cdf0a17", "ac93d17be8c52801b1693ed2be195105",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000000.inc": "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000000.inc":
"81ec58577a603891b5778b4d393734b8", "81ec58577a603891b5778b4d393734b8",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000001.inc": "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000001.inc":
......
...@@ -569,6 +569,10 @@ def get_destroy_call(shader_and_variation): ...@@ -569,6 +569,10 @@ def get_destroy_call(shader_and_variation):
return destroy return destroy
def shader_path(shader):
return '"src/libANGLE/renderer/vulkan/%s"' % slash(shader)
def main(): def main():
# STEP 0: Handle inputs/outputs for run_code_generation.py's auto_script # STEP 0: Handle inputs/outputs for run_code_generation.py's auto_script
shaders_dir = os.path.join('shaders', 'src') shaders_dir = os.path.join('shaders', 'src')
...@@ -690,7 +694,7 @@ def main(): ...@@ -690,7 +694,7 @@ def main():
copyright_year=date.today().year, copyright_year=date.today().year,
out_file_name=out_file_gni, out_file_name=out_file_gni,
input_file_name='shaders/src/*', input_file_name='shaders/src/*',
shaders_list=',\n'.join([' "' + slash(shader) + '"' for shader in output_shaders])) shaders_list=',\n'.join([shader_path(shader) for shader in output_shaders]))
outfile.write(outcode) outfile.write(outcode)
outfile.close() outfile.close()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment