Update SPIRV-Tools

* Fix test expectations

diff --git a/Test/baseLegalResults/hlsl.flattenSubset.frag.out b/Test/baseLegalResults/hlsl.flattenSubset.frag.out
index 0edf712..46d3afb 100644 (file)
--- a/Test/baseLegalResults/hlsl.flattenSubset.frag.out
+++ b/Test/baseLegalResults/hlsl.flattenSubset.frag.out
@@ -6,19 +6,17 @@ hlsl.flattenSubset.frag
                               Capability Shader
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Fragment 4  "main" 47 50
+                              EntryPoint Fragment 4  "main" 50
                               ExecutionMode 4 OriginUpperLeft
                               Source HLSL 500
                               Name 4  "main"
                               Name 21  "samp"
                               Name 33  "tex"
-                              Name 47  "vpos"
                               Name 50  "@entryPointOutput"
                               Decorate 21(samp) DescriptorSet 0
                               Decorate 21(samp) Binding 0
                               Decorate 33(tex) DescriptorSet 0
                               Decorate 33(tex) Binding 1
-                              Decorate 47(vpos) Location 0
                               Decorate 50(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
@@ -34,8 +32,6 @@ hlsl.flattenSubset.frag
               39:             TypeVector 6(float) 2
               40:    6(float) Constant 1056964608
               41:   39(fvec2) ConstantComposite 40 40
-              46:             TypePointer Input 7(fvec4)
-        47(vpos):     46(ptr) Variable Input
               49:             TypePointer Output 7(fvec4)
 50(@entryPointOutput):     49(ptr) Variable Output
          4(main):           2 Function None 3

diff --git a/Test/baseLegalResults/hlsl.flattenSubset2.frag.out b/Test/baseLegalResults/hlsl.flattenSubset2.frag.out
index 00bd55b..408c0ea 100644 (file)
--- a/Test/baseLegalResults/hlsl.flattenSubset2.frag.out
+++ b/Test/baseLegalResults/hlsl.flattenSubset2.frag.out
@@ -6,13 +6,11 @@ hlsl.flattenSubset2.frag
                               Capability Shader
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Fragment 4  "main" 49 52
+                              EntryPoint Fragment 4  "main" 52
                               ExecutionMode 4 OriginUpperLeft
                               Source HLSL 500
                               Name 4  "main"
-                              Name 49  "vpos"
                               Name 52  "@entryPointOutput"
-                              Decorate 49(vpos) Location 0
                               Decorate 52(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
@@ -20,8 +18,6 @@ hlsl.flattenSubset2.frag
                7:             TypeVector 6(float) 4
               43:    6(float) Constant 0
               44:    7(fvec4) ConstantComposite 43 43 43 43
-              48:             TypePointer Input 7(fvec4)
-        49(vpos):     48(ptr) Variable Input
               51:             TypePointer Output 7(fvec4)
 52(@entryPointOutput):     51(ptr) Variable Output
          4(main):           2 Function None 3

diff --git a/known_good.json b/known_good.json
index 96c27de..5da639d 100644 (file)
--- a/known_good.json
+++ b/known_good.json
@@ -5,7 +5,7 @@
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Tools",
       "subdir" : "External/spirv-tools",
-      "commit" : "21e3f681e2004590c7865bc8c0195a4ab8e66c88"
+      "commit" : "4b092d2ab81854e61632bdd1e658907f0071c37e"
     },
     {
       "name" : "spirv-tools/external/spirv-headers",