From 440f95b1e77e61f4383f914a503ec6439806e631 Mon Sep 17 00:00:00 2001 From: Alan Baker Date: Mon, 26 Nov 2018 11:24:22 -0500 Subject: [PATCH] Update known good SPIRV tools and headers * Fixes use of optimizer * Updated test outputs * GeometryStreams and TransformFeedback no longer fail validation --- SPIRV/SpvTools.cpp | 2 +- Test/baseResults/spv.150.geom.out | 4 ---- Test/baseResults/spv.420.geom.out | 4 ---- Test/baseResults/spv.builtInXFB.vert.out | 4 ---- Test/baseResults/spv.xfb.vert.out | 4 ---- Test/baseResults/spv.xfb2.vert.out | 4 ---- Test/baseResults/spv.xfb3.vert.out | 4 ---- known_good.json | 4 ++-- 8 files changed, 3 insertions(+), 27 deletions(-) diff --git a/SPIRV/SpvTools.cpp b/SPIRV/SpvTools.cpp index 05f234c..a886b16 100755 --- a/SPIRV/SpvTools.cpp +++ b/SPIRV/SpvTools.cpp @@ -181,7 +181,7 @@ void SpirvToolsLegalize(const glslang::TIntermediate&, std::vector 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 index 70dadf5..f759793 100644 --- 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 index 45f235f..74a4f0b 100644 --- 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 index f175a19..556a698 100644 --- 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 index 68633e1..3cd93d5 100644 --- 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 index 6dc3987..a8551a1 100644 --- 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 index 1d526aa..0218847 100644 --- 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 index d985507..837255d 100755 --- 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" } ] } -- 2.7.4