Merge pull request #1731 from godlikepanos/master

Avoid running the validator as part of the optimization pass.

Merge pull request #1731 from godlikepanos/master
49dff5bf · John Kessenich · GitHub · b184e41a · 35aeb042 · 49dff5bf
Unverified Commit 49dff5bf authored Mar 18, 2019 by John Kessenich Committed by GitHub Mar 18, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

SpvTools.cpp SPIRV/SpvTools.cpp +3 -1

No files found.
--- a/SPIRV/SpvTools.cpp
+++ b/SPIRV/SpvTools.cpp
@@ -191,7 +191,9 @@ void SpirvToolsLegalize(const glslang::TIntermediate&, std::vector<unsigned int>
        optimizer.RegisterPass(spvtools::CreateRedundantLineInfoElimPass());
    }

-    optimizer.Run(spirv.data(), spirv.size(), &spirv);
+    spvtools::OptimizerOptions spvOptOptions;
+    spvOptOptions.set_run_validator(false); // The validator may run as a seperate step later on
+    optimizer.Run(spirv.data(), spirv.size(), &spirv, spvOptOptions);
 }

 }; // end namespace glslang