Added support for user-defined structs. And fixed a bug in function return type.

src/compiler/Intermediate.cpp

@@ -795,9 +795,9 @@ bool TIntermBinary::promote(TInfoSink& infoSink)
 		// Set array information.
 		//
 		case EOpAssign:
-		case EOpInitialize:
-			getType().setArraySize(left->getType().getArraySize());
-			getType().setArrayInformationType(left->getType().getArrayInformationType());
+                case EOpInitialize:
+                        getTypePointer()->setArraySize(left->getType().getArraySize());
+			getTypePointer()->setArrayInformationType(left->getType().getArrayInformationType());
 			break;
 
 		default:

src/compiler/OutputGLSL.cpp

@@ -56,6 +56,7 @@ TOutputGLSL::TOutputGLSL(TParseContext &context)
 {
 }
 
+// Header declares user-defined structs.
 void TOutputGLSL::header()
 {
     TInfoSinkBase& out = objSink();
@@ -68,11 +69,25 @@ void TOutputGLSL::header()
             continue;
 
         const TVariable* variable = static_cast<const TVariable*>(symbol);
-        const TString& name = variable->getName();
+        if (!variable->isUserType())
+            continue;
+
         const TType& type = variable->getType();
-        TQualifier qualifier = type.getQualifier();
+        ASSERT(type.getQualifier() == EvqTemporary);
+        ASSERT(type.getBasicType() == EbtStruct);
 
-        //symbol->dump(parseContext.infoSink);
+        out << "struct " << variable->getName() << "{\n";
+        const TTypeList* structure = type.getStruct();
+        ASSERT(structure != NULL);
+        incrementDepth();
+        for (size_t i = 0; i < structure->size(); ++i) {
+            const TType* fieldType = (*structure)[i].type;
+            ASSERT(fieldType != NULL);
+            out << getIndentationString(depth);
+            out << getTypeName(*fieldType) << " " << fieldType->getFieldName() << ";\n";
+        }
+        decrementDepth();
+        out << "};\n";
     }
 }
 
@@ -198,7 +213,7 @@ bool TOutputGLSL::visitBinary(Visit visit, TIntermBinary* node)
         case EOpEqual: UNIMPLEMENTED(); break;
         case EOpNotEqual: UNIMPLEMENTED(); break;
         case EOpLessThan: writeTriplet(visit, "(", " < ", ")"); break;
-        case EOpGreaterThan: writeTriplet(visit, NULL, " > ", NULL); break;
+        case EOpGreaterThan: writeTriplet(visit, "(", " > ", ")"); break;
         case EOpLessThanEqual: UNIMPLEMENTED(); break;
         case EOpGreaterThanEqual: UNIMPLEMENTED(); break;
 
@@ -338,7 +353,7 @@ bool TOutputGLSL::visitAggregate(Visit visit, TIntermAggregate* node)
         case EOpFunction:
             if (visit == PreVisit)
             {
-                TString returnType = node->getBasicString();
+                TString returnType = getTypeName(node->getType());
                 TString functionName = TFunction::unmangleName(node->getName());
                 out << returnType << " " << functionName;
             }

src/compiler/OutputHLSL.cpp

@@ -988,7 +988,7 @@ void OutputHLSL::visitConstantUnion(TIntermConstantUnion *node)
 {
     TInfoSinkBase &out = context.infoSink.obj;
     
-    TType &type = node->getType();
+    const TType &type = node->getType();
 
     if (type.isField())
     {

src/compiler/intermediate.h

@@ -232,9 +232,9 @@ public:
 	TIntermTyped(const TType& t) : type(t)  { }
 	virtual TIntermTyped* getAsTyped()         { return this; }
 	virtual void setType(const TType& t) { type = t; }
-	virtual TType getType() const { return type; }
+	virtual const TType& getType() const { return type; }
 	virtual TType* getTypePointer() { return &type; }
-	
+
 	virtual TBasicType getBasicType() const { return type.getBasicType(); }
 	virtual TQualifier getQualifier() const { return type.getQualifier(); }
 	virtual int getNominalSize() const { return type.getNominalSize(); }