Update known good SPIRV tools and headers

* Fixes use of optimizer * Updated test outputs * GeometryStreams and TransformFeedback no longer fail validation
KhronosGroup · Nov 26, 2018 · 440f95b · 440f95b
1 parent 83fe01e
commit 440f95b
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 27 deletions.
diff --git a/SPIRV/SpvTools.cpp b/SPIRV/SpvTools.cpp
@@ -181,7 +181,7 @@ void SpirvToolsLegalize(const glslang::TIntermediate&, std::vector<unsigned int>
     optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass());
     optimizer.RegisterPass(spvtools::CreateCFGCleanupPass());
 
-    optimizer.Run(spirv.data(), spirv.size(), &spirv, spvtools::ValidatorOptions(), true);
+    optimizer.Run(spirv.data(), spirv.size(), &spirv);
 }
 
 }; // end namespace glslang

diff --git a/Test/baseResults/spv.150.geom.out b/Test/baseResults/spv.150.geom.out
@@ -1,8 +1,4 @@
 spv.150.geom
-error: SPIRV-Tools Validation Errors
-error: Capability GeometryStreams is not allowed by Vulkan 1.0 specification (or requires extension)
-  OpCapability GeometryStreams
-
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 71

diff --git a/Test/baseResults/spv.420.geom.out b/Test/baseResults/spv.420.geom.out
@@ -1,8 +1,4 @@
 spv.420.geom
-error: SPIRV-Tools Validation Errors
-error: Capability GeometryStreams is not allowed by Vulkan 1.0 specification (or requires extension)
-  OpCapability GeometryStreams
-
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 72

diff --git a/Test/baseResults/spv.builtInXFB.vert.out b/Test/baseResults/spv.builtInXFB.vert.out
@@ -1,8 +1,4 @@
 spv.builtInXFB.vert
-error: SPIRV-Tools Validation Errors
-error: Capability TransformFeedback is not allowed by Vulkan 1.0 specification (or requires extension)
-  OpCapability TransformFeedback
-
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 21

diff --git a/Test/baseResults/spv.xfb.vert.out b/Test/baseResults/spv.xfb.vert.out
@@ -1,8 +1,4 @@
 spv.xfb.vert
-error: SPIRV-Tools Validation Errors
-error: Capability TransformFeedback is not allowed by Vulkan 1.0 specification (or requires extension)
-  OpCapability TransformFeedback
-
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 16

diff --git a/Test/baseResults/spv.xfb2.vert.out b/Test/baseResults/spv.xfb2.vert.out
@@ -1,8 +1,4 @@
 spv.xfb2.vert
-error: SPIRV-Tools Validation Errors
-error: Capability TransformFeedback is not allowed by Vulkan 1.0 specification (or requires extension)
-  OpCapability TransformFeedback
-
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 35

diff --git a/Test/baseResults/spv.xfb3.vert.out b/Test/baseResults/spv.xfb3.vert.out
@@ -1,8 +1,4 @@
 spv.xfb3.vert
-error: SPIRV-Tools Validation Errors
-error: Capability TransformFeedback is not allowed by Vulkan 1.0 specification (or requires extension)
-  OpCapability TransformFeedback
-
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 35

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" : "8e9be303b00ba352ee25dbcd352769641637a853"
+      "commit" : "d543f7dfed9ba02910996121375e57fff92c3c93"
     },
     {
       "name" : "spirv-tools/external/spirv-headers",
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Headers",
       "subdir" : "External/spirv-tools/external/spirv-headers",
-      "commit" : "a2c529b5dda18838ab4b52f816acfebd774eaab3"
+      "commit" : "282879ca34563020dbe73fd8f7d45bed6755626a"
     }
   ]
 }