Explorar el Código

[spirv] updating SPIRV-Tools to fix segfault (#2353)

Jaebaek Seo hace 6 años
padre
commit
5ae65630d4
Se han modificado 2 ficheros con 6 adiciones y 2 borrados
  1. 1 1
      external/SPIRV-Tools
  2. 5 1
      tools/clang/unittests/SPIRV/CodeGenSpirvTest.cpp

+ 1 - 1
external/SPIRV-Tools

@@ -1 +1 @@
-Subproject commit 5081512502df32b38a38712adb0d8c1b23bb1c2e
+Subproject commit aa9e8f538041db3055ea443080e0ccc315fa114f

+ 5 - 1
tools/clang/unittests/SPIRV/CodeGenSpirvTest.cpp

@@ -157,7 +157,10 @@ TEST_F(FileTest, VarInitTbuffer) {
 TEST_F(FileTest, VarInitWarningIngored) {
   runFileTest("var.init.warning.ignored.hlsl", Expect::Warning);
 }
-TEST_F(FileTest, VarInitOpaque) { runFileTest("var.init.opaque.hlsl"); }
+TEST_F(FileTest, VarInitOpaque) {
+  setBeforeHLSLLegalization();
+  runFileTest("var.init.opaque.hlsl");
+}
 TEST_F(FileTest, VarInitCrossStorageClass) {
   runFileTest("var.init.cross-storage-class.hlsl");
 }
@@ -216,6 +219,7 @@ TEST_F(FileTest, BinaryOpAssignComposite) {
 TEST_F(FileTest, BinaryOpAssignOpaqueArray) {
   // Test that for copying opaque arrays, we load each element via access chain
   // separately, create an composite, and then write out once
+  setBeforeHLSLLegalization();
   runFileTest("binary-op.assign.opaque.array.hlsl");
 }