diff --git a/glslang/MachineIndependent/ShaderLang.cpp b/glslang/MachineIndependent/ShaderLang.cpp index e3d89ef9..6f9db019 100755 --- a/glslang/MachineIndependent/ShaderLang.cpp +++ b/glslang/MachineIndependent/ShaderLang.cpp @@ -480,7 +480,9 @@ void SetupBuiltinSymbolTable(int version, EProfile profile, const SpvVersion& sp void DumpBuiltinSymbolTable(TInfoSink& infoSink, const TSymbolTable& symbolTable) { infoSink.debug << "BuiltinSymbolTable {\n"; + symbolTable.dump(infoSink, true); + infoSink.debug << "}\n"; } @@ -915,9 +917,8 @@ bool ProcessDeferred( return false; } - if (messages & EShMsgBuiltinSymbolTable) { + if (messages & EShMsgBuiltinSymbolTable) DumpBuiltinSymbolTable(compiler->infoSink, *symbolTable); - } // // Now we can process the full shader under proper symbols and rules. diff --git a/glslang/MachineIndependent/SymbolTable.cpp b/glslang/MachineIndependent/SymbolTable.cpp index d20f78e4..6e721ea6 100755 --- a/glslang/MachineIndependent/SymbolTable.cpp +++ b/glslang/MachineIndependent/SymbolTable.cpp @@ -196,8 +196,8 @@ void TVariable::dump(TInfoSink &infoSink, bool complete) const { infoSink.debug << getName().c_str() << ": " << type.getCompleteString(); dumpExtensions(infoSink); - } - else { + } else + { infoSink.debug << getName().c_str() << ": " << type.getStorageQualifierString() << " " << type.getBasicTypeString(); if (type.isArray()) @@ -213,11 +213,14 @@ void TFunction::dump(TInfoSink &infoSink, bool complete) const { if (complete) { - infoSink.debug << getName().c_str() << ": " << returnType.getCompleteString() << " " << getName().c_str() << "("; + infoSink.debug << getName().c_str() << ": " << returnType.getCompleteString() << " " << getName().c_str() + << "("; int numParams = getParamCount(); - for (int i = 0; i < numParams; i++){ - const TParameter& param = parameters[i]; - infoSink.debug << param.type->getCompleteString() << " " << (param.name ? param.name->c_str() : "") << (i < numParams-1 ? "," : ""); + for (int i = 0; i < numParams; i++) + { + const TParameter ¶m = parameters[i]; + infoSink.debug << param.type->getCompleteString() << " " + << (param.name ? param.name->c_str() : "") << (i < numParams - 1 ? "," : ""); } infoSink.debug << ")"; dumpExtensions(infoSink);