commit 574d9dd0ad5e9edabd895f5eecaa7e04c06d0e87
author Jamie Madill <jmadill@transgaming.com> Thu Jun 20 11:55:56 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:05:07 2013 -0400
tree de026a450167236efcb8bc3d5276a1f0b58eec17
parent 919b066af57e8f160f4f292bc7a6323d146b0850

Add support for std140 uniform block layout for basic types.

This support does not include structures.

TRAC #23083

Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods
Authored-by: Jamie Madill

src/compiler/OutputHLSL.h

diff --git a/src/compiler/OutputHLSL.h b/src/compiler/OutputHLSL.h
index 6fa8bca..2b7bce3 100644
--- a/src/compiler/OutputHLSL.h
+++ b/src/compiler/OutputHLSL.h
@@ -173,6 +173,7 @@
     int mUniformRegister;
     int mInterfaceBlockRegister;
     int mSamplerRegister;
+    int mPaddingCounter;
 
     TString registerString(TIntermSymbol *operand);
     int samplerRegister(TIntermSymbol *sampler);
@@ -185,9 +186,11 @@
     TString interfaceBlockStructName(const TType &interfaceBlockType);
     TString interfaceBlockInstanceString(const TType& interfaceBlockType, unsigned int arrayIndex);
     TString interfaceBlockMemberTypeString(const TType &memberType);
-    TString interfaceBlockMemberString(const TTypeList &typeList);
+    TString interfaceBlockMemberString(const TTypeList &typeList, TLayoutBlockStorage blockStorage);
     TString interfaceBlockStructString(const TType &interfaceBlockType);
     TString interfaceBlockString(const TType &interfaceBlockType, unsigned int registerIndex, unsigned int arrayIndex);
+    TString std140PrePaddingString(const TType &type, int *elementIndex);
+    TString std140PostPaddingString(const TType &type);
     
     static GLenum glVariableType(const TType &type);
     static GLenum glVariablePrecision(const TType &type);