commit 9d2ffb1d4a28c39fd73df5b04d043d8995d6816a
author Jamie Madill <jmadill@chromium.org> Fri Aug 30 13:21:04 2013 -0400
committer Jamie Madill <jmadill@chromium.org> Mon Sep 09 15:27:50 2013 -0400
tree 723b098f6afec2148fa968d767896814496fcf3d
parent 912cbfe8de6371d76b65382a12e7d7ef2f16106f

Refactor sh::Uniform and sh::ShaderVariable into a shader variable base type with different child types.

This change gives us better memory usage (many fields are unnecessary in different types) with better static
typing and clear type abstraction for specific methods that might take Attributes or Varyings, etc.

TRAC #23754

Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods

src/compiler/OutputHLSL.h

diff --git a/src/compiler/OutputHLSL.h b/src/compiler/OutputHLSL.h
index d258306..2d32dbc 100644
--- a/src/compiler/OutputHLSL.h
+++ b/src/compiler/OutputHLSL.h
@@ -32,10 +32,10 @@
     void output();
 
     TInfoSinkBase &getBodyStream();
-    const ActiveUniforms &getUniforms();
+    const std::vector<Uniform> &getUniforms();
     const ActiveInterfaceBlocks &getInterfaceBlocks() const;
-    const ActiveShaderVariables &getOutputVariables() const;
-    const ActiveShaderVariables &getAttributes() const;
+    const std::vector<Attribute> &getOutputVariables() const;
+    const std::vector<Attribute> &getAttributes() const;
 
     TString typeString(const TType &type);
     TString textureString(const TType &type);
@@ -176,7 +176,8 @@
     TString registerString(TIntermSymbol *operand);
     int samplerRegister(TIntermSymbol *sampler);
     int uniformRegister(TIntermSymbol *uniform);
-    void declareUniformToList(const TType &type, const TString &name, int registerIndex, ActiveUniforms& output);
+    void declareInterfaceBlockField(const TType &type, const TString &name, std::vector<InterfaceBlockField>& output);
+    void declareUniformToList(const TType &type, const TString &name, int registerIndex, std::vector<Uniform>& output);
     void declareUniform(const TType &type, const TString &name, int index);
 
     TString interfaceBlockFieldString(const TInterfaceBlock &interfaceBlock, const TField &field);
@@ -197,10 +198,10 @@
     static bool isVaryingOut(TQualifier qualifier);
     static bool isVarying(TQualifier qualifier);
 
-    ActiveUniforms mActiveUniforms;
+    std::vector<Uniform> mActiveUniforms;
     ActiveInterfaceBlocks mActiveInterfaceBlocks;
-    ActiveShaderVariables mActiveOutputVariables;
-    ActiveShaderVariables mActiveAttributes;
+    std::vector<Attribute> mActiveOutputVariables;
+    std::vector<Attribute> mActiveAttributes;
     std::map<TString, int> mStd140StructElementIndexes;
     std::map<TIntermTyped*, TString> mFlaggedStructMappedNames;
     std::map<TIntermTyped*, TString> mFlaggedStructOriginalNames;