build: Update shader tools to latest known-good
diff --git a/build-android/known_good.json b/build-android/known_good.json
index 11f32ec..45136da 100755
--- a/build-android/known_good.json
+++ b/build-android/known_good.json
@@ -4,13 +4,13 @@
"name" : "shaderc",
"url" : "https://github.com/google/shaderc.git",
"sub_dir" : "shaderc",
- "commit" : "d0d8d7e7ea5074cb107499a73a22ce14bec3fb10"
+ "commit" : "315d39d082875047f4fbd004e6eedef14ff2db24"
},
{
"name" : "glslang",
"url" : "https://github.com/KhronosGroup/glslang.git",
"sub_dir" : "shaderc/third_party/glslang",
- "commit" : "2fb89a0072ae7316af1c856f22663fde4928128a"
+ "commit" : "c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5"
},
{
"name" : "Vulkan-Headers",
@@ -28,13 +28,13 @@
"name" : "SPIRV-Tools",
"url" : "https://github.com/KhronosGroup/SPIRV-Tools.git",
"sub_dir" : "shaderc/third_party/spirv-tools",
- "commit" : "9529d3c2c647bf7c7aa1a2601d0209da98f8fa1e"
+ "commit" : "21e3f681e2004590c7865bc8c0195a4ab8e66c88"
},
{
"name" : "SPIRV-Headers",
"url" : "https://github.com/KhronosGroup/SPIRV-Headers.git",
"sub_dir" : "shaderc/third_party/spirv-tools/external/spirv-headers",
- "commit" : "449bc986ba6f4c5e10e32828783f9daef2a77644"
+ "commit" : "814e728b30ddd0f4509233099a3ad96fd4318c07"
},
{
"name": "robin-hood-hashing",
diff --git a/layers/generated/spirv_grammar_helper.cpp b/layers/generated/spirv_grammar_helper.cpp
index 3570794..afd2d07 100644
--- a/layers/generated/spirv_grammar_helper.cpp
+++ b/layers/generated/spirv_grammar_helper.cpp
@@ -319,6 +319,7 @@
case spv::ImageOperandsMinLodMask:
case spv::ImageOperandsMakeTexelAvailableMask:
case spv::ImageOperandsMakeTexelVisibleMask:
+ case spv::ImageOperandsOffsetsMask:
return 1;
case spv::ImageOperandsGradMask:
return 2;
diff --git a/layers/generated/spirv_grammar_helper.h b/layers/generated/spirv_grammar_helper.h
index ffbab99..e1b66f4 100644
--- a/layers/generated/spirv_grammar_helper.h
+++ b/layers/generated/spirv_grammar_helper.h
@@ -724,6 +724,20 @@
return "OpDemoteToHelperInvocationEXT";
case spv::OpIsHelperInvocationEXT:
return "OpIsHelperInvocationEXT";
+ case spv::OpConvertUToImageNV:
+ return "OpConvertUToImageNV";
+ case spv::OpConvertUToSamplerNV:
+ return "OpConvertUToSamplerNV";
+ case spv::OpConvertImageToUNV:
+ return "OpConvertImageToUNV";
+ case spv::OpConvertSamplerToUNV:
+ return "OpConvertSamplerToUNV";
+ case spv::OpConvertUToSampledImageNV:
+ return "OpConvertUToSampledImageNV";
+ case spv::OpConvertSampledImageToUNV:
+ return "OpConvertSampledImageToUNV";
+ case spv::OpSamplerImageAddressingModeNV:
+ return "OpSamplerImageAddressingModeNV";
case spv::OpSubgroupShuffleINTEL:
return "OpSubgroupShuffleINTEL";
case spv::OpSubgroupShuffleDownINTEL:
@@ -772,8 +786,8 @@
return "OpIMul32x16INTEL";
case spv::OpUMul32x16INTEL:
return "OpUMul32x16INTEL";
- case spv::OpConstFunctionPointerINTEL:
- return "OpConstFunctionPointerINTEL";
+ case spv::OpConstantFunctionPointerINTEL:
+ return "OpConstantFunctionPointerINTEL";
case spv::OpFunctionPointerCallINTEL:
return "OpFunctionPointerCallINTEL";
case spv::OpAsmTargetINTEL:
diff --git a/layers/generated/spirv_tools_commit_id.h b/layers/generated/spirv_tools_commit_id.h
index c455b70..ef877e8 100644
--- a/layers/generated/spirv_tools_commit_id.h
+++ b/layers/generated/spirv_tools_commit_id.h
@@ -26,4 +26,4 @@
****************************************************************************/
#pragma once
-#define SPIRV_TOOLS_COMMIT_ID "9529d3c2c647bf7c7aa1a2601d0209da98f8fa1e"
+#define SPIRV_TOOLS_COMMIT_ID "21e3f681e2004590c7865bc8c0195a4ab8e66c88"
diff --git a/scripts/known_good.json b/scripts/known_good.json
index f0e1070..85d6c4e 100755
--- a/scripts/known_good.json
+++ b/scripts/known_good.json
@@ -6,7 +6,7 @@
"sub_dir" : "glslang",
"build_dir" : "glslang/build",
"install_dir" : "glslang/build/install",
- "commit": "2fb89a0072ae7316af1c856f22663fde4928128a",
+ "commit": "c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5",
"cmake_options" : [
"-DUSE_CCACHE=ON"
],
@@ -26,7 +26,7 @@
"sub_dir": "SPIRV-Headers",
"build_dir": "SPIRV-Headers/build",
"install_dir": "SPIRV-Headers/build/install",
- "commit": "449bc986ba6f4c5e10e32828783f9daef2a77644"
+ "commit": "814e728b30ddd0f4509233099a3ad96fd4318c07"
},
{
"name": "SPIRV-Tools",
@@ -37,7 +37,7 @@
"cmake_options": [
"-DSPIRV-Headers_SOURCE_DIR={repo_dir}/../SPIRV-Headers"
],
- "commit": "9529d3c2c647bf7c7aa1a2601d0209da98f8fa1e"
+ "commit": "21e3f681e2004590c7865bc8c0195a4ab8e66c88"
},
{
"name": "robin-hood-hashing",
