diff --git a/3rdparty/spirv-tools/include/generated/build-version.inc b/3rdparty/spirv-tools/include/generated/build-version.inc
index c0a8de587..daff9475b 100644
--- a/3rdparty/spirv-tools/include/generated/build-version.inc
+++ b/3rdparty/spirv-tools/include/generated/build-version.inc
@@ -1 +1 @@
-"v2021.2-dev", "SPIRV-Tools v2021.2-dev 08e3d51a9e950b97e7b84ab7a62f2e9922a8aceb"
+"v2021.2-dev", "SPIRV-Tools v2021.2-dev d75e1d772441c7e8fef5a4667e8a03b5ec191014"
diff --git a/3rdparty/spirv-tools/include/generated/generators.inc b/3rdparty/spirv-tools/include/generated/generators.inc
index ddad4fb44..43ed6e9ab 100644
--- a/3rdparty/spirv-tools/include/generated/generators.inc
+++ b/3rdparty/spirv-tools/include/generated/generators.inc
@@ -27,4 +27,5 @@
 {26, "Xenia", "Xenia Emulator Microcode Translator", "Xenia Xenia Emulator Microcode Translator"},
 {27, "Embark Studios", "Rust GPU Compiler Backend", "Embark Studios Rust GPU Compiler Backend"},
 {28, "gfx-rs community", "Naga", "gfx-rs community Naga"},
-{29, "Mikkosoft Productions", "MSP Shader Compiler", "Mikkosoft Productions MSP Shader Compiler"},
\ No newline at end of file
+{29, "Mikkosoft Productions", "MSP Shader Compiler", "Mikkosoft Productions MSP Shader Compiler"},
+{30, "SpvGenTwo community", "SpvGenTwo SPIR-V IR Tools", "SpvGenTwo community SpvGenTwo SPIR-V IR Tools"},
\ No newline at end of file
diff --git a/3rdparty/spirv-tools/source/opt/folding_rules.cpp b/3rdparty/spirv-tools/source/opt/folding_rules.cpp
index e6add1516..e3e926c3a 100644
--- a/3rdparty/spirv-tools/source/opt/folding_rules.cpp
+++ b/3rdparty/spirv-tools/source/opt/folding_rules.cpp
@@ -1867,6 +1867,8 @@ FoldingRule BitCastScalarOrVector() {
 
     const analysis::Constant* bitcasted_constant =
         ConvertWordsToNumericScalarOrVectorConstant(const_mgr, words, type);
+    if (!bitcasted_constant) return false;
+
     auto new_feeder_id =
         const_mgr->GetDefiningInstruction(bitcasted_constant, inst->type_id())
             ->result_id();