Add a std140 padding helper class.

Using a helper class keeps our main parser stateless as we define std140 structs which need padding. The only functional change should be that we no longer use a global counter for struct padding hidden variables, but a local padding per-struct. BUG=angle:466 Change-Id: I8b92d65884b86571c8b2f052b0cba6150a4bbab0 Reviewed-on: https://chromium-review.googlesource.com/202911Tested-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Zhenyao Mo <zmo@chromium.org> Reviewed-by: Nicolas Capens <nicolascapens@chromium.org>

Add a std140 padding helper class.
3891fd27 · Jamie Madill · cec3590a · 3891fd27 · 3891fd27
Commit 3891fd27 authored Jun 13, 2014 by Jamie Madill
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 129 additions and 109 deletions

OutputHLSL.cpp src/compiler/translator/OutputHLSL.cpp +125 -104

OutputHLSL.h src/compiler/translator/OutputHLSL.h +4 -5

No files found.
--- a/src/compiler/translator/OutputHLSL.cpp
+++ b/src/compiler/translator/OutputHLSL.cpp
--- a/src/compiler/translator/OutputHLSL.h
+++ b/src/compiler/translator/OutputHLSL.h
@@ -42,7 +42,7 @@ class OutputHLSL : public TIntermTraverser
    TString samplerString(const TType &type);
    TString interpolationString(TQualifier qualifier);
    TString structureString(const TStructure &structure, bool useHLSLRowMajorPacking, bool useStd140Packing);
-    TString structureTypeName(const TStructure &structure, bool useHLSLRowMajorPacking, bool useStd140Packing);
+    static 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);
@@ -76,7 +76,7 @@ class OutputHLSL : public TIntermTraverser
    void storeStd140ElementIndex(const TStructure &structure, bool useHLSLRowMajorPacking);
    const ConstantUnion *writeConstantUnion(const TType &type, const ConstantUnion *constUnion);

-    TString structNameString(const TStructure &structure);
+    static TString structNameString(const TStructure &structure);

    TParseContext &mContext;
    const ShShaderOutput mOutputType;
@@ -174,7 +174,6 @@ class OutputHLSL : public TIntermTraverser
    int mUniformRegister;
    int mInterfaceBlockRegister;
    int mSamplerRegister;
-    int mPaddingCounter;

    TString registerString(TIntermSymbol *operand);
    int samplerRegister(TIntermSymbol *sampler);
@@ -195,10 +194,10 @@ class OutputHLSL : public TIntermTraverser
    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 TStructure &structure, const TString &rhsStructName);
    
+    class Std140PaddingHelper;
+
    static GLenum glVariableType(const TType &type);
    static GLenum glVariablePrecision(const TType &type);
    static bool isVaryingIn(TQualifier qualifier);