commit dd037b2a85b3e3fff73b6d04014f7030a2ceb99f
author alokp@chromium.org <alokp@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Mar 30 18:47:20 2010 +0000
committer alokp@chromium.org <alokp@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Mar 30 18:47:20 2010 +0000
tree e032631a13da0be4ada57ca762e9bde718ffc030
parent d25ab251094d86350299e9ebde5df7486b4cc69a

Added support for user-defined structs. And fixed a bug in function return type.
Review URL: http://codereview.appspot.com/849042

git-svn-id: https://angleproject.googlecode.com/svn/trunk@88 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/compiler/OutputGLSL.cpp

diff --git a/src/compiler/OutputGLSL.cpp b/src/compiler/OutputGLSL.cpp
index 7831b62..4119459 100644
--- a/src/compiler/OutputGLSL.cpp
+++ b/src/compiler/OutputGLSL.cpp
@@ -56,6 +56,7 @@
 {
 }
 
+// Header declares user-defined structs.
 void TOutputGLSL::header()
 {
     TInfoSinkBase& out = objSink();
@@ -68,11 +69,25 @@
             continue;
 
         const TVariable* variable = static_cast<const TVariable*>(symbol);
-        const TString& name = variable->getName();
-        const TType& type = variable->getType();
-        TQualifier qualifier = type.getQualifier();
+        if (!variable->isUserType())
+            continue;
 
-        //symbol->dump(parseContext.infoSink);
+        const TType& type = variable->getType();
+        ASSERT(type.getQualifier() == EvqTemporary);
+        ASSERT(type.getBasicType() == EbtStruct);
+
+        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 @@
         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 @@
         case EOpFunction:
             if (visit == PreVisit)
             {
-                TString returnType = node->getBasicString();
+                TString returnType = getTypeName(node->getType());
                 TString functionName = TFunction::unmangleName(node->getName());
                 out << returnType << " " << functionName;
             }