diff options
| author | alan-baker <alanbaker@google.com> | 2023-01-06 16:15:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-06 16:15:37 -0500 |
| commit | bab12ea70acf303ef841e89368338720363c11ce (patch) | |
| tree | 8bb27ee2b8d632d5756e58ce6556690dde066f5d | |
| parent | af97b8531b219f968640f8c9d84daa957a93f1dc (diff) | |
| download | amber-bab12ea70acf303ef841e89368338720363c11ce.tar.gz | |
Update SPIRV deps (#1012)
* Switch to strip non-semantic pass
* update android kokoro cmake
| -rw-r--r-- | DEPS | 4 | ||||
| -rwxr-xr-x | kokoro/android/build.sh | 6 | ||||
| -rw-r--r-- | src/clspv_helper.cc | 2 |
3 files changed, 6 insertions, 6 deletions
@@ -20,8 +20,8 @@ vars = { 'json_revision': '4f8fba14066156b73f1189a2b8bd568bde5284c5', 'lodepng_revision': '5601b8272a6850b7c5d693dd0c0e16da50be8d8d', 'shaderc_revision': 'e72186b66bb90ed06aaf15cbdc9a053581a0616b', - 'spirv_headers_revision': '0bcc624926a25a2a273d07877fd25a6ff5ba1cfb', - 'spirv_tools_revision': 'cc5fca057ec61748e5fbde429adee155c7392510', + 'spirv_headers_revision': 'd13b52222c39a7e9a401b44646f0ca3a640fbd47', + 'spirv_tools_revision': 'd87f61605b3647fbceae9aaa922fce0031afdc63', 'swiftshader_revision': 'bca23447ad4667a7b79973569ab5d8d905d211ac', 'vulkan_headers_revision': '1dace16d8044758d32736eb59802d171970e9448', 'vulkan_loader_revision': '8aad559a09388ceb5b968af64a2b965d3886e5a0', diff --git a/kokoro/android/build.sh b/kokoro/android/build.sh index 5f38129..6c1e8ad 100755 --- a/kokoro/android/build.sh +++ b/kokoro/android/build.sh @@ -35,9 +35,9 @@ echo y | sudo apt-get purge --auto-remove cmake # Installing the 3.14.0 version. # Glslang requires 3.14.0 -wget http://www.cmake.org/files/v3.14/cmake-3.14.0.tar.gz -tar -xvzf cmake-3.14.0.tar.gz -pushd cmake-3.14.0/ +wget http://www.cmake.org/files/v3.18/cmake-3.18.6.tar.gz +tar -xvzf cmake-3.18.6.tar.gz +pushd cmake-3.18.6/ ./configure make sudo make install diff --git a/src/clspv_helper.cc b/src/clspv_helper.cc index 4be5bfa..f940c87 100644 --- a/src/clspv_helper.cc +++ b/src/clspv_helper.cc @@ -278,7 +278,7 @@ Result Compile(Pipeline::ShaderInfo* shader_info, // Strip the reflection instructions to avoid requiring the implementation to // support VK_KHR_shader_non_semantic_info. spvtools::Optimizer opt(env); - opt.RegisterPass(spvtools::CreateStripReflectInfoPass()); + opt.RegisterPass(spvtools::CreateStripNonSemanticInfoPass()); std::vector<uint32_t> stripped; if (!opt.Run(generated_binary->data(), generated_binary->size(), &stripped)) { return Result("failed to strip reflection instructions"); |