mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minor improvements to formating

Browse Source
This commit is contained in:
Christoph Kubisch 2019-04-15 13:37:12 +02:00
parent 412ff6ea6a
commit b84a520492
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glslang/MachineIndependent/ShaderLang.cpp
View File

@ -480,7 +480,9 @@ void SetupBuiltinSymbolTable(int version, EProfile profile, const SpvVersion& sp
void DumpBuiltinSymbolTable(TInfoSink& infoSink, const TSymbolTable& symbolTable) void DumpBuiltinSymbolTable(TInfoSink& infoSink, const TSymbolTable& symbolTable)
{ {
infoSink.debug << "BuiltinSymbolTable {\n"; infoSink.debug << "BuiltinSymbolTable {\n";
symbolTable.dump(infoSink, true); symbolTable.dump(infoSink, true);
infoSink.debug << "}\n"; infoSink.debug << "}\n";
} }
@ -915,9 +917,8 @@ bool ProcessDeferred(
return false; return false;
} }
if (messages & EShMsgBuiltinSymbolTable) { if (messages & EShMsgBuiltinSymbolTable)
DumpBuiltinSymbolTable(compiler->infoSink, *symbolTable); DumpBuiltinSymbolTable(compiler->infoSink, *symbolTable);
}
// //
// Now we can process the full shader under proper symbols and rules. // Now we can process the full shader under proper symbols and rules.

15
glslang/MachineIndependent/SymbolTable.cpp
View File

@ -196,8 +196,8 @@ void TVariable::dump(TInfoSink &infoSink, bool complete) const
{ {
infoSink.debug << getName().c_str() << ": " << type.getCompleteString(); infoSink.debug << getName().c_str() << ": " << type.getCompleteString();
dumpExtensions(infoSink); dumpExtensions(infoSink);
} } else
else { {
infoSink.debug << getName().c_str() << ": " << type.getStorageQualifierString() << " " infoSink.debug << getName().c_str() << ": " << type.getStorageQualifierString() << " "
<< type.getBasicTypeString(); << type.getBasicTypeString();
if (type.isArray()) if (type.isArray())
@ -213,11 +213,14 @@ void TFunction::dump(TInfoSink &infoSink, bool complete) const
{ {
if (complete) 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(); int numParams = getParamCount();
for (int i = 0; i < numParams; i++){ 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 ? "," : ""); const TParameter &param = parameters[i];
infoSink.debug << param.type->getCompleteString() << " "
<< (param.name ? param.name->c_str() : "") << (i < numParams - 1 ? "," : "");
} }
infoSink.debug << ")"; infoSink.debug << ")";
dumpExtensions(infoSink); dumpExtensions(infoSink);