commit 98493ddc137922a6ce5c8b22ffde0ed2a1fa2b3d
author Jamie Madill <jmadill@transgaming.com> Mon Jul 08 14:39:03 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:08:08 2013 -0400
tree 552b49eb532c750feb840a3a98499d531a6e4dfa
parent f386bf76d5751e0bfa2073ca57210c73d8b85809

Simplified TType class by carving out TStructure and TField.

R=kbr@chromium.org

Review URL: https://codereview.appspot.com/9866043

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

TRAC #23415
Authored-by: alokp@chromium.org
Signed-off-by: Shannon Woods
Signed-off-by Nicolas Capens
Merged-by: Jamie Madill

src/compiler/OutputHLSL.h

diff --git a/src/compiler/OutputHLSL.h b/src/compiler/OutputHLSL.h
index e4c6699..b4f68dc 100644
--- a/src/compiler/OutputHLSL.h
+++ b/src/compiler/OutputHLSL.h
@@ -40,14 +40,14 @@
     TString typeString(const TType &type);
     TString textureString(const TType &type);
     TString interpolationString(TQualifier qualifier);
-    TString structureString(const TType &structType, bool useHLSLRowMajorPacking, bool useStd140Packing);
-    TString structureTypeName(const TType &structType, bool useHLSLRowMajorPacking, bool useStd140Packing);
+    TString structureString(const TStructure &structure, bool useHLSLRowMajorPacking, bool useStd140Packing);
+    TString structureTypeName(const TStructure &structure, bool useHLSLRowMajorPacking, bool useStd140Packing);
     static TString qualifierString(TQualifier qualifier);
     static TString arrayString(const TType &type);
     static TString initializer(const TType &type);
     static TString decorate(const TString &string);                      // Prepends an underscore to avoid naming clashes
     static TString decorateUniform(const TString &string, const TType &type);
-    static TString decorateField(const TString &string, const TType &structure);
+    static TString decorateField(const TString &string, const TStructure &structure);
 
   protected:
     void header();
@@ -187,20 +187,20 @@
     TString registerString(TIntermSymbol *operand);
     int samplerRegister(TIntermSymbol *sampler);
     int uniformRegister(TIntermSymbol *uniform);
-    void declareUniformToList(const TType &type, const TString &name, int index, ActiveUniforms& output);
+    void declareUniformToList(const TType &type, const TString &name, int registerIndex, ActiveUniforms& output);
     void declareUniform(const TType &type, const TString &name, int index);
 
-    TString interfaceBlockUniformName(const TType &interfaceBlockType, const TType &uniformType);
+    TString interfaceBlockFieldString(const TInterfaceBlock &interfaceBlock, const TField &field);
     TString decoratePrivate(const TString &privateText);
-    TString interfaceBlockStructName(const TType &interfaceBlockType);
-    TString interfaceBlockInstanceString(const TType& interfaceBlockType, unsigned int arrayIndex);
-    TString interfaceBlockMemberTypeString(const TType &memberType, TLayoutBlockStorage blockStorage);
-    TString interfaceBlockMemberString(const TTypeList &typeList, TLayoutBlockStorage blockStorage);
-    TString interfaceBlockStructString(const TType &interfaceBlockType);
-    TString interfaceBlockString(const TType &interfaceBlockType, unsigned int registerIndex, unsigned int arrayIndex);
+    TString interfaceBlockStructNameString(const TInterfaceBlock &interfaceBlockType);
+    TString interfaceBlockInstanceString(const TInterfaceBlock& interfaceBlock, unsigned int arrayIndex);
+    TString interfaceBlockFieldTypeString(const TField &field, TLayoutBlockStorage blockStorage);
+    TString interfaceBlockFieldString(const TInterfaceBlock &interfaceBlock, TLayoutBlockStorage blockStorage);
+    TString interfaceBlockStructString(const TInterfaceBlock &interfaceBlock);
+    TString interfaceBlockString(const TInterfaceBlock &interfaceBlock, unsigned int registerIndex, unsigned int arrayIndex);
     TString std140PrePaddingString(const TType &type, int *elementIndex);
     TString std140PostPaddingString(const TType &type, bool useHLSLRowMajorPacking);
-    TString structInitializerString(int indent, const TTypeList &structMembers, const TString &structName);
+    TString structInitializerString(int indent, const TStructure &structure, const TString &rhsStructName);
     
     static GLenum glVariableType(const TType &type);
     static GLenum glVariablePrecision(const TType &type);