Commit a532570a by Jamie Madill Committed by Commit Bot

Vulkan: Cleanups to shader generation script.

Fixes the suprious newlines messages. Also prefer a Release directory when writing shaders for performance. Also adds glslang's git HEAD to the list of generated hashes. This should ensure we regenerate all shaders when there's a roll of glslang. Glslang was rolled prior to this CL. Also update the SPRI-V libs. Bug: angleproject:3227 Change-Id: I1fd212a08000c08ef41b60c4201edd3ac771f91d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1516512Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 198658a3
...@@ -15,10 +15,10 @@ vars = { ...@@ -15,10 +15,10 @@ vars = {
'glslang_revision': '5efb004d59601711cdf328c8a8bfbe7f333dc7a0', 'glslang_revision': '5efb004d59601711cdf328c8a8bfbe7f333dc7a0',
# Current revision fo the SPIRV-Headers Vulkan support library. # Current revision fo the SPIRV-Headers Vulkan support library.
'spirv_headers_revision': '8bea0a266ac9b718aa0818d9e3a47c0b77c2cb23', 'spirv_headers_revision': '111a25e4ae45e2b4d7c18415e1d6884712b958c4',
# Current revision of SPIRV-Tools for Vulkan. # Current revision of SPIRV-Tools for Vulkan.
'spirv_tools_revision': 'fde69dcd80cc1ca548300702adf01eeb25441f3e', 'spirv_tools_revision': '2ac348b5c0a58c64305379baca778c2e58873cd6',
# Current revision of Khronos Vulkan-Headers. # Current revision of Khronos Vulkan-Headers.
'vulkan_headers_revision': 'c200cb25db0f47364d3318d92c1d8e9dfff2fef1', 'vulkan_headers_revision': 'c200cb25db0f47364d3318d92c1d8e9dfff2fef1',
......
...@@ -192,103 +192,103 @@ ...@@ -192,103 +192,103 @@
"Vulkan format:src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp": "Vulkan format:src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp":
"1d22113470fbe8506e1264923f1793d2", "1d22113470fbe8506e1264923f1793d2",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py":
"97e148951cbbf009ab963ca5a90ddf1a", "e5fa1f79a91ff812f24b5755eba8e145",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000000.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000000.inc":
"aa007002f1c386fbd0ef23842801f3b0", "155f523ecd36bae6b6abec5a41379e68",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000001.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000001.inc":
"85109f972925b49341e28bcdedee17ef", "d9534fe0f7efdcfde72f78f6613092f9",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000002.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000002.inc":
"18f1338f8816c82b220d66444ed89347", "659eba521787c864dd30038440535a10",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000003.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000003.inc":
"992047a9ba7b4e7137ded9081f186872", "521e5a82b411b78b34370cf798cc9548",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000004.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000004.inc":
"875d3ae7117f58c8c4447bc3ce107778", "e45c591070d7059ac7a7fa6c1c89ea6f",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000005.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000005.inc":
"ef916d5e0de87a37f5cd4e3a3520f960", "a052ed08c94d9f53bc3b34eb008e0179",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000006.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000006.inc":
"e7bb8f3abd6482d6ce7c7c35bbba772a", "60efdb7ab3dcef36f307725f70d1a9e2",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000007.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000007.inc":
"179fe2b50bd1947e86403a9fa80883ba", "6220fe97ed85e62cbd9cc940c73dd431",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000008.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000008.inc":
"fc756b1b614c11437f436e9913f7a666", "1cd4d9c574ccc72800a9bf5ac92dfdbb",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000009.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000009.inc":
"e81c83f5880edf045bf7f8f8a3f81298", "8ca2c4448adad679583e5ab5f9639456",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000A.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000A.inc":
"152ee2a0a4cad628257c3e47068a5bc4", "ce79b4e6293469ea8ffbb76dd1bef418",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000B.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000B.inc":
"1c7ff0a63d22f24b11e460efb074dad6", "f525976a9e2b401942b5f0a73fc2bdd1",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000000.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000000.inc":
"5b4cb3203020b3fc2ce3d02cfdf18e7a", "af27efcb251ca41f57e01bb30ef76618",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000001.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000001.inc":
"40eb3ff16d7083706ee56062b6982407", "b421ba24cfb0617377638a9b97698d20",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000002.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000002.inc":
"5a6575940c92c22821e102fc35e91a77", "af5c33aa3fef1fa70263a0f0c73e4cb8",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000003.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000003.inc":
"1aec6858837dce1cdd28060a8859b992", "d3ed8a98558803d2d517cf935f6f63a5",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000004.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000004.inc":
"59f5ddd672b8cbf850569ffb7b8b7245", "6cb2b55e67ed63decaa12968d30e9372",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000005.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000005.inc":
"713f6cd052458639db1bd2d433cf1f79", "9fbe32ef969d335c276b430bd20da383",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000006.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000006.inc":
"ed5af7b2d920733e76bc06f2c3b164ce", "70adf526fa0ed4a8858908886e92690e",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000007.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000007.inc":
"f8d4bd3b0f022570bf5c373aae1a1eeb", "abd98892f94abcddbcb0919c48bc6809",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000008.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000008.inc":
"74619bd4129eed30a92eb9b4153a3102", "842bf00a3fdb570849175ca93d66b8d1",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000009.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000009.inc":
"abaaa11bd808030c19ad1935e12e4ac3", "4c5f5465b43f1ad78a82e7e4511be626",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000A.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000A.inc":
"37210579d5cc23b15849f888d6174ea8", "285b71f4e55b3b50364f31afc8bda2e0",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000B.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000B.inc":
"f69c274d122b233d1178d211abd8077d", "425c4948c87eaad1dfa14dbbc38a619f",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000C.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000C.inc":
"d07d651b147c994d1498727e305b1c63", "ebb9d9f4d7996318ed65c5311397635d",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000D.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000D.inc":
"edab6697752cb0d9bbdfe1b1b4043241", "5c9b00799ddcab3d6cacd84e2fcb57e8",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000E.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000E.inc":
"232af09e03c58c0a05e7dbb1f4298133", "19a8c2f9122cde39081cbdbb75f3c5e8",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000F.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000F.inc":
"6c48361bd61138c0c6387400c87f68ed", "7da54090eaecdd567f952627a2984ae5",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/FullScreenQuad.vert.00000000.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/FullScreenQuad.vert.00000000.inc":
"d3cb0d2a3c1e6457e7d11e95d0e8d8d5", "287c50011ced97a7338b47a0a50127bf",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000000.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000000.inc":
"33f4a2663d3548be013da03b518e51bd", "2d4b01d728c41ef1304ad3ef1305a1c7",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000000.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000000.inc":
"5f81809ca35eb191aaeacfe6e20a585a", "aa438413134a29ec32ae4551a04e60b5",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000001.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000001.inc":
"d1077262f9873606c2c5b38b32e6e97f", "8d7b5e131eedd5b74c74b9616212cb03",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000002.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000002.inc":
"3461de5f2b8551fad685648e91ae5861", "77e896bc4a8261e64604b86f6cee766f",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000003.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000003.inc":
"813364c4e5c6e55098e251d967d3c8ae", "dddbba197d5815b8c06cad98a2844765",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000004.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000004.inc":
"27554047e29b6adcdff35ee9a4e7a955", "db72eb95d645a6d0e37c586bbcda10ab",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000005.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000005.inc":
"d07513ecf1657ae13bb87450362d84d1", "92afec8280ee2c85645c4c0ccbd50cf1",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000008.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000008.inc":
"30bc550480906a71004842ce59dbf9e4", "c7d6e7d7ef26ffd1dcde84c45ae12380",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000009.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000009.inc":
"f6618202ad3ec0e092252622b645c5a4", "bbaa939e53bcb2b40e04456a2c84e331",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000A.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000A.inc":
"34073fe8f464c082e0f5fe5b36a6f7e4", "b7a8d8c59c22c50dae78d7f1a93a9e10",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000B.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000B.inc":
"2c0e86e6be6b931309fdc919832cb63c", "2ee89548f040ead1c063b10539643313",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000C.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000C.inc":
"ff7538eb96b25e2a60753f85c85dc3c9", "6ba9ab79c1f23ecb1f1979e6ca546590",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000D.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000D.inc":
"04f8754e24b09ef449b7db9de62ad1a7", "a972790dde4e79ac3edb963480da217f",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000010.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000010.inc":
"4e50fd06b6c48150dd75f1513fb7fb3b", "eb82c08fd6265af47d5d1ba051482d1a",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000011.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000011.inc":
"fce6f6fdb66315b2fe762ea4037a3cbe", "7513b9d19c72e110904be4ae69427720",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000012.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000012.inc":
"80f0cf394bf6ecd99f46cad0835f8c90", "b2cd87d8d421aa0ca80a32e2222ab622",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000013.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000013.inc":
"9037b65050619a88aacf7d2b71aaa5ea", "16604f359a4f54a53e8dcc5b0879d175",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000014.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000014.inc":
"4f516bc3d811e72b86d98a4874411297", "27efbc5d0cf348e436a545ada03b74b3",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000015.inc": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000015.inc":
"9c05f406e59fd487616d77ad1df133b4", "fb45a663a98b6895e6afeab8f6486b1e",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/src/BufferUtils.comp": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/src/BufferUtils.comp":
"0c8c050841543da0d7faca2559212aa8", "0c8c050841543da0d7faca2559212aa8",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp":
...@@ -303,6 +303,8 @@ ...@@ -303,6 +303,8 @@
"959f09bfb979cdc240f1df50b56d8429", "959f09bfb979cdc240f1df50b56d8429",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h":
"e70f3fa32f5ff0e567ce4ed2a5dc759e", "e70f3fa32f5ff0e567ce4ed2a5dc759e",
"Vulkan internal shader programs:third_party/glslang/src/.git/HEAD":
"4cf2d64e44205fe628ddd534e1151b58",
"Vulkan mandatory format support table:src/libANGLE/renderer/angle_format.py": "Vulkan mandatory format support table:src/libANGLE/renderer/angle_format.py":
"b18ca0fe4835114a4a2f54977b19e798", "b18ca0fe4835114a4a2f54977b19e798",
"Vulkan mandatory format support table:src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py": "Vulkan mandatory format support table:src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py":
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
# code upload please run scripts/run_code_generation.py. # code upload please run scripts/run_code_generation.py.
from datetime import date from datetime import date
import io
import json import json
import os import os
import re import re
...@@ -21,7 +22,7 @@ out_file_h = 'vk_internal_shaders_autogen.h' ...@@ -21,7 +22,7 @@ out_file_h = 'vk_internal_shaders_autogen.h'
out_file_gni = 'vk_internal_shaders_autogen.gni' out_file_gni = 'vk_internal_shaders_autogen.gni'
# Templates for the generated files: # Templates for the generated files:
template_shader_library_cpp = """// GENERATED FILE - DO NOT EDIT. template_shader_library_cpp = u"""// GENERATED FILE - DO NOT EDIT.
// Generated by {script_name} using data from {input_file_name} // Generated by {script_name} using data from {input_file_name}
// //
// Copyright {copyright_year} The ANGLE Project Authors. All rights reserved. // Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
...@@ -93,7 +94,7 @@ void ShaderLibrary::destroy(VkDevice device) ...@@ -93,7 +94,7 @@ void ShaderLibrary::destroy(VkDevice device)
}} // namespace rx }} // namespace rx
""" """
template_shader_library_h = """// GENERATED FILE - DO NOT EDIT. template_shader_library_h = u"""// GENERATED FILE - DO NOT EDIT.
// Generated by {script_name} using data from {input_file_name} // Generated by {script_name} using data from {input_file_name}
// //
// Copyright {copyright_year} The ANGLE Project Authors. All rights reserved. // Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
...@@ -136,7 +137,7 @@ class ShaderLibrary final : angle::NonCopyable ...@@ -136,7 +137,7 @@ class ShaderLibrary final : angle::NonCopyable
#endif // LIBANGLE_RENDERER_VULKAN_VK_INTERNAL_SHADERS_AUTOGEN_H_ #endif // LIBANGLE_RENDERER_VULKAN_VK_INTERNAL_SHADERS_AUTOGEN_H_
""" """
template_shader_includes_gni = """# GENERATED FILE - DO NOT EDIT. template_shader_includes_gni = u"""# GENERATED FILE - DO NOT EDIT.
# Generated by {script_name} using data from {input_file_name} # Generated by {script_name} using data from {input_file_name}
# #
# Copyright {copyright_year} The ANGLE Project Authors. All rights reserved. # Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
...@@ -174,14 +175,16 @@ def get_output_path(name): ...@@ -174,14 +175,16 @@ def get_output_path(name):
# Finds a path to GN's out directory # Finds a path to GN's out directory
def find_build_path(path): def find_build_path(path):
out = os.path.join(path, "out") out = os.path.join(path, 'out')
if (os.path.isdir(out)): if (os.path.isdir(out)):
for o in os.listdir(out): # Prefer release directories.
subdir = os.path.join(out, o) for pattern in ['elease', '']:
if os.path.isdir(subdir): for o in os.listdir(out):
argsgn = os.path.join(subdir, "args.gn") subdir = os.path.join(out, o)
if os.path.isfile(argsgn): if os.path.isdir(subdir) and pattern in o:
return subdir argsgn = os.path.join(subdir, "args.gn")
if os.path.isfile(argsgn):
return subdir
else: else:
parent = os.path.join(path, "..") parent = os.path.join(path, "..")
if (os.path.isdir(parent)): if (os.path.isdir(parent)):
...@@ -302,7 +305,7 @@ def compile_variation(glslang_path, shader_file, shader_basename, flags, enums, ...@@ -302,7 +305,7 @@ def compile_variation(glslang_path, shader_file, shader_basename, flags, enums,
shader_text = subprocess.check_output(glslang_preprocessor_output_args) shader_text = subprocess.check_output(glslang_preprocessor_output_args)
incfile.write('\n\n#if 0 // Generated from:\n') incfile.write('\n\n#if 0 // Generated from:\n')
incfile.write(cleanup_preprocessed_shader(shader_text)) incfile.write(cleanup_preprocessed_shader(shader_text.replace('\r\n', '\n')))
incfile.write('\n#endif // Preprocessed code\n') incfile.write('\n#endif // Preprocessed code\n')
class ShaderAndVariations: class ShaderAndVariations:
...@@ -465,7 +468,8 @@ def main(): ...@@ -465,7 +468,8 @@ def main():
for shader in os.listdir(shaders_dir) for shader in os.listdir(shaders_dir)
if any([os.path.splitext(shader)[1] == ext for ext in valid_extensions])]) if any([os.path.splitext(shader)[1] == ext for ext in valid_extensions])])
if print_inputs: if print_inputs:
print(",".join(input_shaders)) glslang_git_head = '../../../../third_party/glslang/src/.git/HEAD'
print(",".join(input_shaders + [glslang_git_head]))
sys.exit(0) sys.exit(0)
# STEP 1: Call glslang to generate the internal shaders into small .inc files. # STEP 1: Call glslang to generate the internal shaders into small .inc files.
...@@ -563,7 +567,7 @@ def main(): ...@@ -563,7 +567,7 @@ def main():
outfile.close() outfile.close()
# STEP 3: Create a gni file with the generated files. # STEP 3: Create a gni file with the generated files.
with open(out_file_gni, 'w') as outfile: with io.open(out_file_gni, 'w', newline='\n') as outfile:
outcode = template_shader_includes_gni.format( outcode = template_shader_includes_gni.format(
script_name = __file__, script_name = __file__,
copyright_year = date.today().year, copyright_year = date.today().year,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kBufferUtils_comp_00000000[] = { const uint32_t kBufferUtils_comp_00000000[] = {
0x07230203,0x00010000,0x00080007,0x0000003d,0x00000000,0x00020011,0x00000001,0x00020011, 0x07230203,0x00010000,0x00080007,0x0000003d,0x00000000,0x00020011,0x00000001,0x00020011,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kBufferUtils_comp_00000001[] = { const uint32_t kBufferUtils_comp_00000001[] = {
0x07230203,0x00010000,0x00080007,0x00000033,0x00000000,0x00020011,0x00000001,0x00020011, 0x07230203,0x00010000,0x00080007,0x00000033,0x00000000,0x00020011,0x00000001,0x00020011,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kBufferUtils_comp_00000002[] = { const uint32_t kBufferUtils_comp_00000002[] = {
0x07230203,0x00010000,0x00080007,0x00000041,0x00000000,0x00020011,0x00000001,0x00020011, 0x07230203,0x00010000,0x00080007,0x00000041,0x00000000,0x00020011,0x00000001,0x00020011,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kBufferUtils_comp_00000003[] = { const uint32_t kBufferUtils_comp_00000003[] = {
0x07230203,0x00010000,0x00080007,0x00000037,0x00000000,0x00020011,0x00000001,0x00020011, 0x07230203,0x00010000,0x00080007,0x00000037,0x00000000,0x00020011,0x00000001,0x00020011,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kBufferUtils_comp_00000004[] = { const uint32_t kBufferUtils_comp_00000004[] = {
0x07230203,0x00010000,0x00080007,0x0000003c,0x00000000,0x00020011,0x00000001,0x00020011, 0x07230203,0x00010000,0x00080007,0x0000003c,0x00000000,0x00020011,0x00000001,0x00020011,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kBufferUtils_comp_00000005[] = { const uint32_t kBufferUtils_comp_00000005[] = {
0x07230203,0x00010000,0x00080007,0x00000032,0x00000000,0x00020011,0x00000001,0x00020011, 0x07230203,0x00010000,0x00080007,0x00000032,0x00000000,0x00020011,0x00000001,0x00020011,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kBufferUtils_comp_00000006[] = { const uint32_t kBufferUtils_comp_00000006[] = {
0x07230203,0x00010000,0x00080007,0x00000040,0x00000000,0x00020011,0x00000001,0x00020011, 0x07230203,0x00010000,0x00080007,0x00000040,0x00000000,0x00020011,0x00000001,0x00020011,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kBufferUtils_comp_00000007[] = { const uint32_t kBufferUtils_comp_00000007[] = {
0x07230203,0x00010000,0x00080007,0x00000036,0x00000000,0x00020011,0x00000001,0x00020011, 0x07230203,0x00010000,0x00080007,0x00000036,0x00000000,0x00020011,0x00000001,0x00020011,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kBufferUtils_comp_00000008[] = { const uint32_t kBufferUtils_comp_00000008[] = {
0x07230203,0x00010000,0x00080007,0x0000003c,0x00000000,0x00020011,0x00000001,0x00020011, 0x07230203,0x00010000,0x00080007,0x0000003c,0x00000000,0x00020011,0x00000001,0x00020011,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kBufferUtils_comp_00000009[] = { const uint32_t kBufferUtils_comp_00000009[] = {
0x07230203,0x00010000,0x00080007,0x00000032,0x00000000,0x00020011,0x00000001,0x00020011, 0x07230203,0x00010000,0x00080007,0x00000032,0x00000000,0x00020011,0x00000001,0x00020011,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kBufferUtils_comp_0000000A[] = { const uint32_t kBufferUtils_comp_0000000A[] = {
0x07230203,0x00010000,0x00080007,0x00000040,0x00000000,0x00020011,0x00000001,0x00020011, 0x07230203,0x00010000,0x00080007,0x00000040,0x00000000,0x00020011,0x00000001,0x00020011,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kBufferUtils_comp_0000000B[] = { const uint32_t kBufferUtils_comp_0000000B[] = {
0x07230203,0x00010000,0x00080007,0x00000036,0x00000000,0x00020011,0x00000001,0x00020011, 0x07230203,0x00010000,0x00080007,0x00000036,0x00000000,0x00020011,0x00000001,0x00020011,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kConvertVertex_comp_00000000[] = { const uint32_t kConvertVertex_comp_00000000[] = {
0x07230203,0x00010000,0x00080007,0x00000134,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x00000134,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kConvertVertex_comp_00000001[] = { const uint32_t kConvertVertex_comp_00000001[] = {
0x07230203,0x00010000,0x00080007,0x00000125,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x00000125,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kConvertVertex_comp_00000002[] = { const uint32_t kConvertVertex_comp_00000002[] = {
0x07230203,0x00010000,0x00080007,0x0000011d,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x0000011d,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kConvertVertex_comp_00000003[] = { const uint32_t kConvertVertex_comp_00000003[] = {
0x07230203,0x00010000,0x00080007,0x0000010e,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x0000010e,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kConvertVertex_comp_00000004[] = { const uint32_t kConvertVertex_comp_00000004[] = {
0x07230203,0x00010000,0x00080007,0x000000f4,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x000000f4,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kConvertVertex_comp_00000005[] = { const uint32_t kConvertVertex_comp_00000005[] = {
0x07230203,0x00010000,0x00080007,0x000000e5,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x000000e5,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kConvertVertex_comp_00000006[] = { const uint32_t kConvertVertex_comp_00000006[] = {
0x07230203,0x00010000,0x00080007,0x000000e0,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x000000e0,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kConvertVertex_comp_00000007[] = { const uint32_t kConvertVertex_comp_00000007[] = {
0x07230203,0x00010000,0x00080007,0x000000d1,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x000000d1,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kConvertVertex_comp_00000008[] = { const uint32_t kConvertVertex_comp_00000008[] = {
0x07230203,0x00010000,0x00080007,0x000000fe,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x000000fe,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kConvertVertex_comp_00000009[] = { const uint32_t kConvertVertex_comp_00000009[] = {
0x07230203,0x00010000,0x00080007,0x000000ef,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x000000ef,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kConvertVertex_comp_0000000A[] = { const uint32_t kConvertVertex_comp_0000000A[] = {
0x07230203,0x00010000,0x00080007,0x000000e6,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x000000e6,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kConvertVertex_comp_0000000B[] = { const uint32_t kConvertVertex_comp_0000000B[] = {
0x07230203,0x00010000,0x00080007,0x000000d7,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x000000d7,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kConvertVertex_comp_0000000C[] = { const uint32_t kConvertVertex_comp_0000000C[] = {
0x07230203,0x00010000,0x00080007,0x000000de,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x000000de,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kConvertVertex_comp_0000000D[] = { const uint32_t kConvertVertex_comp_0000000D[] = {
0x07230203,0x00010000,0x00080007,0x000000cf,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x000000cf,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kConvertVertex_comp_0000000E[] = { const uint32_t kConvertVertex_comp_0000000E[] = {
0x07230203,0x00010000,0x00080007,0x000000d9,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x000000d9,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kConvertVertex_comp_0000000F[] = { const uint32_t kConvertVertex_comp_0000000F[] = {
0x07230203,0x00010000,0x00080007,0x000000ca,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x000000ca,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kFullScreenQuad_vert_00000000[] = { const uint32_t kFullScreenQuad_vert_00000000[] = {
0x07230203,0x00010000,0x00080007,0x00000024,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x00000024,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageClear_frag_00000000[] = { const uint32_t kImageClear_frag_00000000[] = {
0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageCopy_frag_00000000[] = { const uint32_t kImageCopy_frag_00000000[] = {
0x07230203,0x00010000,0x00080007,0x00000099,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x00000099,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageCopy_frag_00000001[] = { const uint32_t kImageCopy_frag_00000001[] = {
0x07230203,0x00010000,0x00080007,0x000000a0,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x000000a0,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageCopy_frag_00000002[] = { const uint32_t kImageCopy_frag_00000002[] = {
0x07230203,0x00010000,0x00080007,0x00000098,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x00000098,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageCopy_frag_00000003[] = { const uint32_t kImageCopy_frag_00000003[] = {
0x07230203,0x00010000,0x00080007,0x0000009e,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x0000009e,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageCopy_frag_00000004[] = { const uint32_t kImageCopy_frag_00000004[] = {
0x07230203,0x00010000,0x00080007,0x00000099,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x00000099,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageCopy_frag_00000005[] = { const uint32_t kImageCopy_frag_00000005[] = {
0x07230203,0x00010000,0x00080007,0x000000a0,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x000000a0,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageCopy_frag_00000008[] = { const uint32_t kImageCopy_frag_00000008[] = {
0x07230203,0x00010000,0x00080007,0x00000096,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x00000096,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageCopy_frag_00000009[] = { const uint32_t kImageCopy_frag_00000009[] = {
0x07230203,0x00010000,0x00080007,0x0000009d,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x0000009d,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageCopy_frag_0000000A[] = { const uint32_t kImageCopy_frag_0000000A[] = {
0x07230203,0x00010000,0x00080007,0x00000098,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x00000098,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageCopy_frag_0000000B[] = { const uint32_t kImageCopy_frag_0000000B[] = {
0x07230203,0x00010000,0x00080007,0x0000009e,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x0000009e,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageCopy_frag_0000000C[] = { const uint32_t kImageCopy_frag_0000000C[] = {
0x07230203,0x00010000,0x00080007,0x00000097,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x00000097,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageCopy_frag_0000000D[] = { const uint32_t kImageCopy_frag_0000000D[] = {
0x07230203,0x00010000,0x00080007,0x0000009e,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x0000009e,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageCopy_frag_00000010[] = { const uint32_t kImageCopy_frag_00000010[] = {
0x07230203,0x00010000,0x00080007,0x00000098,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x00000098,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageCopy_frag_00000011[] = { const uint32_t kImageCopy_frag_00000011[] = {
0x07230203,0x00010000,0x00080007,0x0000009f,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x0000009f,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageCopy_frag_00000012[] = { const uint32_t kImageCopy_frag_00000012[] = {
0x07230203,0x00010000,0x00080007,0x00000098,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x00000098,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageCopy_frag_00000013[] = { const uint32_t kImageCopy_frag_00000013[] = {
0x07230203,0x00010000,0x00080007,0x0000009e,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x0000009e,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageCopy_frag_00000014[] = { const uint32_t kImageCopy_frag_00000014[] = {
0x07230203,0x00010000,0x00080007,0x0000009a,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x0000009a,0x00000000,0x00020011,0x00000001,0x0006000b,
......
// 7.11.3009 // 7.11.3170
#pragma once #pragma once
const uint32_t kImageCopy_frag_00000015[] = { const uint32_t kImageCopy_frag_00000015[] = {
0x07230203,0x00010000,0x00080007,0x000000a1,0x00000000,0x00020011,0x00000001,0x0006000b, 0x07230203,0x00010000,0x00080007,0x000000a1,0x00000000,0x00020011,0x00000001,0x0006000b,
......
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