Update known-good to tools/headers for the Nvidia Turing extensions.

diff --git a/Test/baseResults/hlsl.partialInit.frag.out b/Test/baseResults/hlsl.partialInit.frag.out
index 350a745..2cdbb0f 100644 (file)
--- a/Test/baseResults/hlsl.partialInit.frag.out
+++ b/Test/baseResults/hlsl.partialInit.frag.out
@@ -398,6 +398,10 @@ gl_FragCoord origin is upper left
 0:?     'ci' ( const int)
 0:?       0 (const int)
 
+error: SPIRV-Tools Validation Errors
+error: If OpTypeBool is stored in conjunction with OpVariable, it can only be used with non-externally visible shader Storage Classes: Workgroup, CrossWorkgroup, Private, and Function
+  %_entryPointOutput_c = OpVariable %_ptr_Output_bool Output
+
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 104

diff --git a/Test/baseResults/hlsl.struct.frag.out b/Test/baseResults/hlsl.struct.frag.out
index bd216c8..4ea7bbb 100644 (file)
--- a/Test/baseResults/hlsl.struct.frag.out
+++ b/Test/baseResults/hlsl.struct.frag.out
@@ -211,6 +211,10 @@ gl_FragCoord origin is upper left
 0:?     's.ff3' (layout( location=6) flat in bool)
 0:?     's.ff4' (layout( location=7) in 4-component vector of float)
 
+error: SPIRV-Tools Validation Errors
+error: If OpTypeBool is stored in conjunction with OpVariable, it can only be used with non-externally visible shader Storage Classes: Workgroup, CrossWorkgroup, Private, and Function
+  %s_b = OpVariable %_ptr_Input_bool Input
+
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 102

diff --git a/Test/baseResults/spv.AnyHitShader.rahit.out b/Test/baseResults/spv.AnyHitShader.rahit.out
index 12d5382..1dd88b3 100644 (file)
--- a/Test/baseResults/spv.AnyHitShader.rahit.out
+++ b/Test/baseResults/spv.AnyHitShader.rahit.out
@@ -1,6 +1,4 @@
 spv.AnyHitShader.rahit
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5340
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 81

diff --git a/Test/baseResults/spv.ClosestHitShader.rchit.out b/Test/baseResults/spv.ClosestHitShader.rchit.out
index dcf6fa3..5a1d7fc 100644 (file)
--- a/Test/baseResults/spv.ClosestHitShader.rchit.out
+++ b/Test/baseResults/spv.ClosestHitShader.rchit.out
@@ -1,6 +1,4 @@
 spv.ClosestHitShader.rchit
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5340
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 88

diff --git a/Test/baseResults/spv.IntersectShader.rint.out b/Test/baseResults/spv.IntersectShader.rint.out
index be53d35..bc84c6e 100644 (file)
--- a/Test/baseResults/spv.IntersectShader.rint.out
+++ b/Test/baseResults/spv.IntersectShader.rint.out
@@ -1,6 +1,4 @@
 spv.IntersectShader.rint
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5340
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 71

diff --git a/Test/baseResults/spv.MissShader.rmiss.out b/Test/baseResults/spv.MissShader.rmiss.out
index 6de3a4e..5384084 100644 (file)
--- a/Test/baseResults/spv.MissShader.rmiss.out
+++ b/Test/baseResults/spv.MissShader.rmiss.out
@@ -1,6 +1,4 @@
 spv.MissShader.rmiss
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5340
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 60

diff --git a/Test/baseResults/spv.RayConstants.rgen.out b/Test/baseResults/spv.RayConstants.rgen.out
index 2f391e9..ecbee8a 100644 (file)
--- a/Test/baseResults/spv.RayConstants.rgen.out
+++ b/Test/baseResults/spv.RayConstants.rgen.out
@@ -1,6 +1,4 @@
 spv.RayConstants.rgen
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5340
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 27

diff --git a/Test/baseResults/spv.RayGenShader.rgen.out b/Test/baseResults/spv.RayGenShader.rgen.out
index 749e5dc..ad1ba7c 100644 (file)
--- a/Test/baseResults/spv.RayGenShader.rgen.out
+++ b/Test/baseResults/spv.RayGenShader.rgen.out
@@ -1,6 +1,4 @@
 spv.RayGenShader.rgen
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5340
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 60

diff --git a/Test/baseResults/spv.atomicInt64.comp.out b/Test/baseResults/spv.atomicInt64.comp.out
index a273c66..9c66aec 100644 (file)
--- a/Test/baseResults/spv.atomicInt64.comp.out
+++ b/Test/baseResults/spv.atomicInt64.comp.out
@@ -1,8 +1,4 @@
 spv.atomicInt64.comp
-error: SPIRV-Tools Validation Errors
-error: Capability Int64Atomics is not allowed by Vulkan 1.0 specification (or requires extension)
-  OpCapability Int64Atomics
-
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 149

diff --git a/Test/baseResults/spv.computeShaderDerivatives.comp.out b/Test/baseResults/spv.computeShaderDerivatives.comp.out
index 40bc713..f05dbc0 100644 (file)
--- a/Test/baseResults/spv.computeShaderDerivatives.comp.out
+++ b/Test/baseResults/spv.computeShaderDerivatives.comp.out
@@ -1,6 +1,4 @@
 spv.computeShaderDerivatives.comp
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5288
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 212

diff --git a/Test/baseResults/spv.computeShaderDerivatives2.comp.out b/Test/baseResults/spv.computeShaderDerivatives2.comp.out
index b746c66..94a3dfc 100644 (file)
--- a/Test/baseResults/spv.computeShaderDerivatives2.comp.out
+++ b/Test/baseResults/spv.computeShaderDerivatives2.comp.out
@@ -1,6 +1,4 @@
 spv.computeShaderDerivatives2.comp
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5350
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 212

diff --git a/Test/baseResults/spv.fragmentShaderBarycentric.frag.out b/Test/baseResults/spv.fragmentShaderBarycentric.frag.out
index 309ae80..ffb3527 100644 (file)
--- a/Test/baseResults/spv.fragmentShaderBarycentric.frag.out
+++ b/Test/baseResults/spv.fragmentShaderBarycentric.frag.out
@@ -1,6 +1,4 @@
 spv.fragmentShaderBarycentric.frag
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5284
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 43

diff --git a/Test/baseResults/spv.fragmentShaderBarycentric2.frag.out b/Test/baseResults/spv.fragmentShaderBarycentric2.frag.out
index 31141f9..05dce7a 100644 (file)
--- a/Test/baseResults/spv.fragmentShaderBarycentric2.frag.out
+++ b/Test/baseResults/spv.fragmentShaderBarycentric2.frag.out
@@ -1,6 +1,4 @@
 spv.fragmentShaderBarycentric2.frag
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5284
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 42

diff --git a/Test/baseResults/spv.memoryScopeSemantics.comp.out b/Test/baseResults/spv.memoryScopeSemantics.comp.out
index cf00754..d4e6a4a 100644 (file)
--- a/Test/baseResults/spv.memoryScopeSemantics.comp.out
+++ b/Test/baseResults/spv.memoryScopeSemantics.comp.out
@@ -1,8 +1,4 @@
 spv.memoryScopeSemantics.comp
-error: SPIRV-Tools Validation Errors
-error: Capability Int64Atomics is not allowed by Vulkan 1.0 specification (or requires extension)
-  OpCapability Int64Atomics
-
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 142

diff --git a/Test/baseResults/spv.meshShaderBuiltins.mesh.out b/Test/baseResults/spv.meshShaderBuiltins.mesh.out
index 9f5f394..ef4ff4d 100644 (file)
--- a/Test/baseResults/spv.meshShaderBuiltins.mesh.out
+++ b/Test/baseResults/spv.meshShaderBuiltins.mesh.out
@@ -1,6 +1,4 @@
 spv.meshShaderBuiltins.mesh
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5266
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 147

diff --git a/Test/baseResults/spv.meshShaderPerViewBuiltins.mesh.out b/Test/baseResults/spv.meshShaderPerViewBuiltins.mesh.out
index 25775df..c79a5c3 100644 (file)
--- a/Test/baseResults/spv.meshShaderPerViewBuiltins.mesh.out
+++ b/Test/baseResults/spv.meshShaderPerViewBuiltins.mesh.out
@@ -1,6 +1,4 @@
 spv.meshShaderPerViewBuiltins.mesh
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5266
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 124

diff --git a/Test/baseResults/spv.meshShaderPerViewUserDefined.mesh.out b/Test/baseResults/spv.meshShaderPerViewUserDefined.mesh.out
index 972b015..7e7a37d 100644 (file)
--- a/Test/baseResults/spv.meshShaderPerViewUserDefined.mesh.out
+++ b/Test/baseResults/spv.meshShaderPerViewUserDefined.mesh.out
@@ -1,6 +1,4 @@
 spv.meshShaderPerViewUserDefined.mesh
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5266
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 90

diff --git a/Test/baseResults/spv.meshShaderSharedMem.mesh.out b/Test/baseResults/spv.meshShaderSharedMem.mesh.out
index c0a481f..198f812 100644 (file)
--- a/Test/baseResults/spv.meshShaderSharedMem.mesh.out
+++ b/Test/baseResults/spv.meshShaderSharedMem.mesh.out
@@ -1,6 +1,4 @@
 spv.meshShaderSharedMem.mesh
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5266
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 77

diff --git a/Test/baseResults/spv.meshShaderTaskMem.mesh.out b/Test/baseResults/spv.meshShaderTaskMem.mesh.out
index fc4ff51..93b2a45 100644 (file)
--- a/Test/baseResults/spv.meshShaderTaskMem.mesh.out
+++ b/Test/baseResults/spv.meshShaderTaskMem.mesh.out
@@ -1,6 +1,4 @@
 spv.meshShaderTaskMem.mesh
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5266
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 58

diff --git a/Test/baseResults/spv.meshShaderUserDefined.mesh.out b/Test/baseResults/spv.meshShaderUserDefined.mesh.out
index c14e19c..c3ec915 100644 (file)
--- a/Test/baseResults/spv.meshShaderUserDefined.mesh.out
+++ b/Test/baseResults/spv.meshShaderUserDefined.mesh.out
@@ -1,6 +1,4 @@
 spv.meshShaderUserDefined.mesh
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5266
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 138

diff --git a/Test/baseResults/spv.meshTaskShader.task.out b/Test/baseResults/spv.meshTaskShader.task.out
index 30475b2..9ac27fa 100644 (file)
--- a/Test/baseResults/spv.meshTaskShader.task.out
+++ b/Test/baseResults/spv.meshTaskShader.task.out
@@ -1,6 +1,4 @@
 spv.meshTaskShader.task
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5266
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 104

diff --git a/Test/baseResults/spv.shaderImageFootprint.frag.out b/Test/baseResults/spv.shaderImageFootprint.frag.out
index 31a5f9c..2ada2b5 100644 (file)
--- a/Test/baseResults/spv.shaderImageFootprint.frag.out
+++ b/Test/baseResults/spv.shaderImageFootprint.frag.out
@@ -1,6 +1,4 @@
 spv.shaderImageFootprint.frag
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5282
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 622

diff --git a/Test/baseResults/spv.shadingRate.frag.out b/Test/baseResults/spv.shadingRate.frag.out
index 78017f6..2b6bd31 100644 (file)
--- a/Test/baseResults/spv.shadingRate.frag.out
+++ b/Test/baseResults/spv.shadingRate.frag.out
@@ -1,6 +1,4 @@
 spv.shadingRate.frag
-error: SPIRV-Tools Validation Errors
-error: Invalid capability operand: 5291
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 21

diff --git a/known_good.json b/known_good.json
index 1f89de9..2557fff 100755 (executable)
--- a/known_good.json
+++ b/known_good.json
@@ -5,14 +5,14 @@
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Tools",
       "subdir" : "External/spirv-tools",
-      "commit" : "7600fc0e19c3a99bd3ef2c24515cc508ca1d3cfb"
+      "commit" : "6e2dab2ffd46a5cf62e2edd3908b4351eaf193d1"
     },
     {
       "name" : "spirv-tools/external/spirv-headers",
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Headers",
       "subdir" : "External/spirv-tools/external/spirv-headers",
-      "commit" : "dcf23bdabacc3c54b83b1f9367e7a8adb27f8d87"
+      "commit" : "d5b2e1255f706ce1f88812217e9a554f299848af"
     }
   ]
 }