Skip to content

A
angle
Commit bd203b57 by Jamie Madill Committed by Commit Bot
Options

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
Showing with 117 additions and 113 deletions
scripts/code_generation_hashes/Vulkan_internal_shader_programs.json
{
"src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py":
"a528a53197ea6c8eaa3bb42a7cdf0a17",
"ac93d17be8c52801b1693ed2be195105",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000000.inc":
"81ec58577a603891b5778b4d393734b8",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000001.inc":
......
src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py
......@@ -569,6 +569,10 @@ def get_destroy_call(shader_and_variation):
return destroy
def shader_path(shader):
return '"src/libANGLE/renderer/vulkan/%s"' % slash(shader)
def main():
# STEP 0: Handle inputs/outputs for run_code_generation.py's auto_script
shaders_dir = os.path.join('shaders', 'src')
......@@ -690,7 +694,7 @@ def main():
copyright_year=date.today().year,
out_file_name=out_file_gni,
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.close()
......
src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.gni
......@@ -9,115 +9,115 @@
# List of generated shaders for inclusion in ANGLE's build process.
angle_vulkan_internal_shaders = [
"shaders/gen/BlitResolve.frag.00000000.inc",
"shaders/gen/BlitResolve.frag.00000001.inc",
"shaders/gen/BlitResolve.frag.00000002.inc",
"shaders/gen/BlitResolve.frag.00000003.inc",
"shaders/gen/BlitResolve.frag.00000004.inc",
"shaders/gen/BlitResolve.frag.00000005.inc",
"shaders/gen/BlitResolve.frag.00000006.inc",
"shaders/gen/BlitResolve.frag.00000007.inc",
"shaders/gen/BlitResolve.frag.00000008.inc",
"shaders/gen/BlitResolve.frag.00000009.inc",
"shaders/gen/BlitResolve.frag.0000000A.inc",
"shaders/gen/BlitResolve.frag.0000000B.inc",
"shaders/gen/BlitResolve.frag.0000000C.inc",
"shaders/gen/BlitResolve.frag.0000000D.inc",
"shaders/gen/BlitResolve.frag.0000000E.inc",
"shaders/gen/BlitResolve.frag.0000000F.inc",
"shaders/gen/BlitResolve.frag.00000010.inc",
"shaders/gen/BlitResolve.frag.00000011.inc",
"shaders/gen/BlitResolve.frag.00000012.inc",
"shaders/gen/BlitResolve.frag.00000013.inc",
"shaders/gen/BlitResolve.frag.00000014.inc",
"shaders/gen/BlitResolve.frag.00000015.inc",
"shaders/gen/BlitResolve.frag.00000016.inc",
"shaders/gen/BlitResolve.frag.00000017.inc",
"shaders/gen/BlitResolveStencilNoExport.comp.00000000.inc",
"shaders/gen/BlitResolveStencilNoExport.comp.00000001.inc",
"shaders/gen/BlitResolveStencilNoExport.comp.00000002.inc",
"shaders/gen/BlitResolveStencilNoExport.comp.00000003.inc",
"shaders/gen/BufferUtils.comp.00000000.inc",
"shaders/gen/BufferUtils.comp.00000001.inc",
"shaders/gen/BufferUtils.comp.00000002.inc",
"shaders/gen/BufferUtils.comp.00000003.inc",
"shaders/gen/BufferUtils.comp.00000004.inc",
"shaders/gen/BufferUtils.comp.00000005.inc",
"shaders/gen/BufferUtils.comp.00000006.inc",
"shaders/gen/BufferUtils.comp.00000007.inc",
"shaders/gen/BufferUtils.comp.00000008.inc",
"shaders/gen/BufferUtils.comp.00000009.inc",
"shaders/gen/BufferUtils.comp.0000000A.inc",
"shaders/gen/BufferUtils.comp.0000000B.inc",
"shaders/gen/ConvertIndex.comp.00000000.inc",
"shaders/gen/ConvertIndex.comp.00000001.inc",
"shaders/gen/ConvertVertex.comp.00000000.inc",
"shaders/gen/ConvertVertex.comp.00000001.inc",
"shaders/gen/ConvertVertex.comp.00000002.inc",
"shaders/gen/ConvertVertex.comp.00000003.inc",
"shaders/gen/ConvertVertex.comp.00000004.inc",
"shaders/gen/ConvertVertex.comp.00000005.inc",
"shaders/gen/ConvertVertex.comp.00000006.inc",
"shaders/gen/ConvertVertex.comp.00000007.inc",
"shaders/gen/ConvertVertex.comp.00000008.inc",
"shaders/gen/ConvertVertex.comp.00000009.inc",
"shaders/gen/ConvertVertex.comp.0000000A.inc",
"shaders/gen/ConvertVertex.comp.0000000B.inc",
"shaders/gen/ConvertVertex.comp.0000000C.inc",
"shaders/gen/ConvertVertex.comp.0000000D.inc",
"shaders/gen/ConvertVertex.comp.0000000E.inc",
"shaders/gen/ConvertVertex.comp.0000000F.inc",
"shaders/gen/ConvertVertex.comp.00000010.inc",
"shaders/gen/ConvertVertex.comp.00000011.inc",
"shaders/gen/ConvertVertex.comp.00000012.inc",
"shaders/gen/ConvertVertex.comp.00000013.inc",
"shaders/gen/ConvertVertex.comp.00000014.inc",
"shaders/gen/ConvertVertex.comp.00000015.inc",
"shaders/gen/ConvertVertex.comp.00000016.inc",
"shaders/gen/ConvertVertex.comp.00000017.inc",
"shaders/gen/ConvertVertex.comp.00000018.inc",
"shaders/gen/ConvertVertex.comp.00000019.inc",
"shaders/gen/FullScreenQuad.vert.00000000.inc",
"shaders/gen/ImageClear.frag.00000000.inc",
"shaders/gen/ImageClear.frag.00000001.inc",
"shaders/gen/ImageClear.frag.00000002.inc",
"shaders/gen/ImageClear.frag.00000003.inc",
"shaders/gen/ImageClear.frag.00000004.inc",
"shaders/gen/ImageClear.frag.00000005.inc",
"shaders/gen/ImageClear.frag.00000006.inc",
"shaders/gen/ImageClear.frag.00000007.inc",
"shaders/gen/ImageClear.frag.00000008.inc",
"shaders/gen/ImageClear.frag.00000009.inc",
"shaders/gen/ImageClear.frag.0000000A.inc",
"shaders/gen/ImageClear.frag.0000000B.inc",
"shaders/gen/ImageClear.frag.0000000C.inc",
"shaders/gen/ImageClear.frag.0000000D.inc",
"shaders/gen/ImageClear.frag.0000000E.inc",
"shaders/gen/ImageClear.frag.0000000F.inc",
"shaders/gen/ImageClear.frag.00000010.inc",
"shaders/gen/ImageClear.frag.00000011.inc",
"shaders/gen/ImageClear.frag.00000012.inc",
"shaders/gen/ImageClear.frag.00000013.inc",
"shaders/gen/ImageClear.frag.00000014.inc",
"shaders/gen/ImageClear.frag.00000015.inc",
"shaders/gen/ImageClear.frag.00000016.inc",
"shaders/gen/ImageClear.frag.00000017.inc",
"shaders/gen/ImageCopy.frag.00000000.inc",
"shaders/gen/ImageCopy.frag.00000001.inc",
"shaders/gen/ImageCopy.frag.00000002.inc",
"shaders/gen/ImageCopy.frag.00000003.inc",
"shaders/gen/ImageCopy.frag.00000004.inc",
"shaders/gen/ImageCopy.frag.00000005.inc",
"shaders/gen/ImageCopy.frag.00000008.inc",
"shaders/gen/ImageCopy.frag.00000009.inc",
"shaders/gen/ImageCopy.frag.0000000A.inc",
"shaders/gen/ImageCopy.frag.0000000B.inc",
"shaders/gen/ImageCopy.frag.0000000C.inc",
"shaders/gen/ImageCopy.frag.0000000D.inc",
"shaders/gen/ImageCopy.frag.00000010.inc",
"shaders/gen/ImageCopy.frag.00000011.inc",
"shaders/gen/ImageCopy.frag.00000012.inc",
"shaders/gen/ImageCopy.frag.00000013.inc",
"shaders/gen/ImageCopy.frag.00000014.inc",
"shaders/gen/ImageCopy.frag.00000015.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000000.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000001.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000002.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000003.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000004.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000005.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000006.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000007.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000008.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000009.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000A.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000B.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000C.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000D.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000E.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000F.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000010.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000011.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000012.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000013.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000014.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000015.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000016.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000017.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000000.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000001.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000002.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000003.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000000.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000001.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000002.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000003.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000004.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000005.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000006.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000007.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000008.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000009.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000A.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000B.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000000.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000001.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000000.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000001.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000002.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000003.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000004.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000005.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000006.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000007.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000008.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000009.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000A.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000B.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000C.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000D.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000E.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000F.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000010.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000011.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000012.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000013.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000014.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000015.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000016.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000017.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000018.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000019.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/FullScreenQuad.vert.00000000.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000000.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000001.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000002.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000003.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000004.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000005.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000006.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000007.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000008.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000009.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000A.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000B.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000C.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000D.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000E.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000F.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000010.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000011.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000012.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000013.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000014.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000015.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000016.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000017.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000000.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000001.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000002.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000003.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000004.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000005.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000008.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000009.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000A.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000B.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000C.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000D.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000010.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000011.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000012.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000013.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000014.inc",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000015.inc",
]
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