Merge pull request KhronosGroup#2666 from alan-baker/update-tools

Update SPIRV-Tools and SPIRV-Headers
qingyuanzNV · Jun 15, 2021 · a23e143 · a23e143
2 parents b848fd6 + 3d9a31c
commit a23e143
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/Test/baseResults/hlsl.attribute.expression.comp.out b/Test/baseResults/hlsl.attribute.expression.comp.out
@@ -81,6 +81,7 @@ local_size = (4, 6, 8)
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int bound})
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 
+Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000a
 // Id's are bound by 39

diff --git a/Test/baseResults/hlsl.intrinsics.barriers.comp.out b/Test/baseResults/hlsl.intrinsics.barriers.comp.out
@@ -51,6 +51,7 @@ local_size = (1, 1, 1)
 0:?   Linker Objects
 0:?     '@entryPointOutput' (layout( location=0) out float)
 
+Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000a
 // Id's are bound by 22

diff --git a/Test/baseResults/hlsl.intrinsics.negative.comp.out b/Test/baseResults/hlsl.intrinsics.negative.comp.out
@@ -179,6 +179,7 @@ local_size = (1, 1, 1)
 0:?     'inF2' (layout( location=2) in 4-component vector of float)
 0:?     'inI0' (layout( location=3) in 4-component vector of int)
 
+Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000a
 // Id's are bound by 99

diff --git a/Test/baseResults/spv.subgroupUniformControlFlow.vert.out b/Test/baseResults/spv.subgroupUniformControlFlow.vert.out
@@ -1,7 +1,6 @@
 spv.subgroupUniformControlFlow.vert
 WARNING: 0:7: '' : attribute with arguments not recognized, skipping 
 
-Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000a
 // Id's are bound by 6

diff --git a/known_good.json b/known_good.json
@@ -5,14 +5,14 @@
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Tools",
       "subdir" : "External/spirv-tools",
-      "commit" : "fb02131cb4ac74a357bb53039ca3dd8926bb3b14"
+      "commit" : "4d22f58a812ea02e1ad53c9ccba12cb48f2bd0b2"
     },
     {
       "name" : "spirv-tools/external/spirv-headers",
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Headers",
       "subdir" : "External/spirv-tools/external/spirv-headers",
-      "commit" : "dafead1765f6c1a5f9f8a76387dcb2abe4e54acd"
+      "commit" : "f5417a4b6633c3217c9a1bc2f0c70b1454975ba7"
     }
   ]
 }