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

diff --git a/glslang/Include/Types.h b/glslang/Include/Types.h
index 9b71801..90341dc 100644 (file)
--- a/glslang/Include/Types.h
+++ b/glslang/Include/Types.h
@@ -2019,11 +2019,6 @@ public:
 
         // Add struct/block members
         if (isStruct() && structure) {
-            if (typeName) {
-                appendStr(" ");
-                appendStr(typeName->c_str());
-                appendStr(" ");
-            }
             appendStr("{");
             for (size_t i = 0; i < structure->size(); ++i) {
                 if (! (*structure)[i].type->hiddenMember()) {

diff --git a/glslang/MachineIndependent/SymbolTable.cpp b/glslang/MachineIndependent/SymbolTable.cpp
index 556d5fc..d0b6ecd 100755 (executable)
--- a/glslang/MachineIndependent/SymbolTable.cpp
+++ b/glslang/MachineIndependent/SymbolTable.cpp
@@ -216,7 +216,8 @@ void TFunction::dump(TInfoSink &infoSink, bool complete) const
         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 ? "," : "");
+                           << (param.type->isStruct() ? "of " + param.type->getTypeName() + " " : "")
+                           << (param.name ? *param.name : "") << (i < numParams - 1 ? "," : "");
         }
 
         infoSink.debug << ")";