зеркало из https://github.com/AvaloniaUI/angle.git
Add support for updating glslang_validator binary from Linux.
Updates the glslang_validator binary for Linux in the same commit. Bug: angleproject:3333 Change-Id: Ide42781ec4951e7c09307a0a3b96c36c6ea29d23 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1553828 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
This commit is contained in:
Родитель
a7440a2273
Коммит
82418c8216
|
@ -26,6 +26,7 @@
|
|||
.gclient_entries
|
||||
/src/tests/third_party/gles_conformance_tests
|
||||
/testing
|
||||
/tools/glslang/glslang_validator
|
||||
/tools/glslang/glslang_validator.exe
|
||||
/third_party/cherry
|
||||
/third_party/deqp/src
|
||||
|
|
14
DEPS
14
DEPS
|
@ -296,6 +296,20 @@ hooks = [
|
|||
],
|
||||
},
|
||||
|
||||
# Download glslang validator binary for Linux.
|
||||
{
|
||||
'name': 'linux_glslang_validator',
|
||||
'pattern': '.',
|
||||
'condition': 'checkout_linux and not build_with_chromium',
|
||||
'action': [ 'download_from_google_storage',
|
||||
'--no_resume',
|
||||
'--platform=linux*',
|
||||
'--no_auth',
|
||||
'--bucket', 'angle-glslang-validator',
|
||||
'-s', '{angle_root}/tools/glslang/glslang_validator.sha1',
|
||||
],
|
||||
},
|
||||
|
||||
# Download glslang validator binary for Windows.
|
||||
{
|
||||
'name': 'win_glslang_validator',
|
||||
|
|
|
@ -192,7 +192,7 @@
|
|||
"Vulkan format:src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp":
|
||||
"ef0ea80cf33e60f76391bcfed10b3c0a",
|
||||
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py":
|
||||
"2a1f6e5329769edfe8de7024799db223",
|
||||
"d9a4742e5cba2adefb9608e6439914c9",
|
||||
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000000.inc":
|
||||
"caa03e84d757844a099d0e408a162c7e",
|
||||
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000001.inc":
|
||||
|
@ -351,6 +351,8 @@
|
|||
"930fc6f4a705a0d2121770377d3bc764",
|
||||
"Vulkan internal shader programs:tools/glslang/glslang_validator.exe.sha1":
|
||||
"4e0076daa7a27051c1245b8b339ebd6d",
|
||||
"Vulkan internal shader programs:tools/glslang/glslang_validator.sha1":
|
||||
"ea685e0867a4b3a07ad7e4246ac84e10",
|
||||
"Vulkan mandatory format support table:src/libANGLE/renderer/angle_format.py":
|
||||
"b18ca0fe4835114a4a2f54977b19e798",
|
||||
"Vulkan mandatory format support table:src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py":
|
||||
|
|
|
@ -467,8 +467,9 @@ def main():
|
|||
for shader in os.listdir(shaders_dir)
|
||||
if any([os.path.splitext(shader)[1] == ext for ext in valid_extensions])])
|
||||
if print_inputs:
|
||||
win_glslang_binary = get_win_glslang_exe_path() + '.sha1'
|
||||
print(",".join(input_shaders + [win_glslang_binary]))
|
||||
glslang_binaries = [get_linux_glslang_exe_path(), get_win_glslang_exe_path()]
|
||||
glslang_binary_hashes = [path + '.sha1' for path in glslang_binaries]
|
||||
print(",".join(input_shaders + glslang_binary_hashes))
|
||||
return 0
|
||||
|
||||
# STEP 1: Call glslang to generate the internal shaders into small .inc files.
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
063f4ee998bfa5fea1b2471a2621c7a3107885d6
|
|
@ -77,7 +77,7 @@ def main():
|
|||
glslang_src = os.path.join(out_dir, glslang_exe)
|
||||
glslang_dst = os.path.join(sys.path[0], glslang_exe)
|
||||
|
||||
shutil.copyfile(glslang_src, glslang_dst)
|
||||
shutil.copy(glslang_src, glslang_dst)
|
||||
|
||||
# Step 5: Delete the build directory
|
||||
shutil.rmtree(out_dir)
|
||||
|
|
Загрузка…
Ссылка в новой задаче