Commit 678f5f5a by John Kessenich

Merge pull request #176 from jackoalan/parameterize-ensure

SPV: Ensure Parameterize is called during Disassemble
parents fd3e09fe 52e61acf
...@@ -568,6 +568,7 @@ void GLSLstd450GetDebugNames(const char** names) ...@@ -568,6 +568,7 @@ void GLSLstd450GetDebugNames(const char** names)
void Disassemble(std::ostream& out, const std::vector<unsigned int>& stream) void Disassemble(std::ostream& out, const std::vector<unsigned int>& stream)
{ {
SpirvStream SpirvStream(out, stream); SpirvStream SpirvStream(out, stream);
spv::Parameterize();
GLSLstd450GetDebugNames(GlslStd450DebugNames); GLSLstd450GetDebugNames(GlslStd450DebugNames);
SpirvStream.validate(); SpirvStream.validate();
SpirvStream.processInstructions(); SpirvStream.processInstructions();
......
...@@ -753,7 +753,6 @@ void CompileAndLinkShaderUnits(std::vector<ShaderCompUnit> compUnits) ...@@ -753,7 +753,6 @@ void CompileAndLinkShaderUnits(std::vector<ShaderCompUnit> compUnits)
if (! (Options & EOptionMemoryLeakMode)) { if (! (Options & EOptionMemoryLeakMode)) {
glslang::OutputSpv(spirv, GetBinaryName((EShLanguage)stage)); glslang::OutputSpv(spirv, GetBinaryName((EShLanguage)stage));
if (Options & EOptionHumanReadableSpv) { if (Options & EOptionHumanReadableSpv) {
spv::Parameterize();
spv::Disassemble(std::cout, spirv); spv::Disassemble(std::cout, spirv);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment