Merge pull request #1598 from alan-baker/geo-xfb-caps

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

Test/baseResults/spv.150.geom.out

 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

Test/baseResults/spv.420.geom.out

 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

Test/baseResults/spv.builtInXFB.vert.out

 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

Test/baseResults/spv.xfb.vert.out

 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

Test/baseResults/spv.xfb2.vert.out

 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

Test/baseResults/spv.xfb3.vert.out

 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

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"
     }
   ]
 }