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

revert typeName from getCompleteString() (breaks tests), add to function dump instead

Browse Source
This commit is contained in:
Christoph Kubisch 2019-04-16 13:28:49 +02:00
parent 4b1dfc56b1
commit aa4e527781
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glslang/Include/Types.h
View File

@ -2019,11 +2019,6 @@ public:
// Add struct/block members // Add struct/block members
if (isStruct() && structure) { if (isStruct() && structure) {
if (typeName) {
appendStr(" ");
appendStr(typeName->c_str());
appendStr(" ");
}
appendStr("{"); appendStr("{");
for (size_t i = 0; i < structure->size(); ++i) { for (size_t i = 0; i < structure->size(); ++i) {
if (! (*structure)[i].type->hiddenMember()) { if (! (*structure)[i].type->hiddenMember()) {

3
glslang/MachineIndependent/SymbolTable.cpp
View File

@ -216,7 +216,8 @@ void TFunction::dump(TInfoSink &infoSink, bool complete) const
for (int i = 0; i < numParams; i++) { for (int i = 0; i < numParams; i++) {
const TParameter &param = parameters[i]; const TParameter &param = parameters[i];
infoSink.debug << param.type->getCompleteString() << " " infoSink.debug << param.type->getCompleteString() << " "
<< (param.name ? param.name->c_str() : "") << (i < numParams - 1 ? "," : ""); << (param.type->isStruct() ? "of " + param.type->getTypeName() + " " : "")
<< (param.name ? *param.name : "") << (i < numParams - 1 ? "," : "");
} }
infoSink.debug << ")"; infoSink.debug << ")";