commit 912cbfe8de6371d76b65382a12e7d7ef2f16106f
author Jamie Madill <jmadill@chromium.org> Fri Aug 30 13:21:03 2013 -0400
committer Jamie Madill <jmadill@chromium.org> Mon Sep 09 15:27:50 2013 -0400
tree c88204791287a2bf38849ab505997136dd55bb74
parent bcb6a1e0a882fdaa14601a23b8c557550c8bcfbe

Allow the block encoder classes to encode types directly passed by value, instead of as a compound type.

TRAC #23754

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

src/compiler/HLSLLayoutEncoder.cpp

diff --git a/src/compiler/HLSLLayoutEncoder.cpp b/src/compiler/HLSLLayoutEncoder.cpp
index d422732..8c35f47 100644
--- a/src/compiler/HLSLLayoutEncoder.cpp
+++ b/src/compiler/HLSLLayoutEncoder.cpp
@@ -26,35 +26,33 @@
 {
 }
 
-void HLSLBlockEncoder::getBlockLayoutInfo(const sh::Uniform &uniform, int *arrayStrideOut, int *matrixStrideOut)
+void HLSLBlockEncoder::getBlockLayoutInfo(GLenum type, unsigned int arraySize, bool isRowMajorMatrix, int *arrayStrideOut, int *matrixStrideOut)
 {
-    ASSERT(uniform.fields.empty());
-
     // We assume we are only dealing with 4 byte components (no doubles or half-words currently)
-    ASSERT(gl::UniformComponentSize(gl::UniformComponentType(uniform.type)) == ComponentSize);
+    ASSERT(gl::UniformComponentSize(gl::UniformComponentType(type)) == ComponentSize);
 
     int matrixStride = 0;
     int arrayStride = 0;
 
-    if (gl::IsMatrixType(uniform.type))
+    if (gl::IsMatrixType(type))
     {
         nextRegister();
         matrixStride = RegisterSize;
 
-        if (uniform.arraySize > 0)
+        if (arraySize > 0)
         {
-            const int numRegisters = gl::MatrixRegisterCount(uniform.type, uniform.isRowMajorMatrix);
+            const int numRegisters = gl::MatrixRegisterCount(type, isRowMajorMatrix);
             arrayStride = RegisterSize * numRegisters;
         }
     }
-    else if (uniform.arraySize > 0)
+    else if (arraySize > 0)
     {
         nextRegister();
         arrayStride = RegisterSize;
     }
     else
     {
-        int numComponents = gl::UniformComponentCount(uniform.type);
+        int numComponents = gl::UniformComponentCount(type);
         if ((numComponents + (mCurrentOffset % RegisterSize)) > RegisterSize)
         {
             nextRegister();
@@ -65,24 +63,24 @@
     *arrayStrideOut = arrayStride;
 }
 
-void HLSLBlockEncoder::advanceOffset(const sh::Uniform &uniform, int arrayStride, int matrixStride)
+void HLSLBlockEncoder::advanceOffset(GLenum type, unsigned int arraySize, bool isRowMajorMatrix, int arrayStride, int matrixStride)
 {
-    if (uniform.arraySize > 0)
+    if (arraySize > 0)
     {
-        mCurrentOffset += arrayStride * (uniform.arraySize - 1);
+        mCurrentOffset += arrayStride * (arraySize - 1);
     }
 
-    if (gl::IsMatrixType(uniform.type))
+    if (gl::IsMatrixType(type))
     {
         ASSERT(matrixStride == RegisterSize);
-        const int numRegisters = gl::MatrixRegisterCount(uniform.type, uniform.isRowMajorMatrix);
-        const int numComponents = gl::MatrixComponentCount(uniform.type, uniform.isRowMajorMatrix);
+        const int numRegisters = gl::MatrixRegisterCount(type, isRowMajorMatrix);
+        const int numComponents = gl::MatrixComponentCount(type, isRowMajorMatrix);
         mCurrentOffset += RegisterSize * (numRegisters - 1);
         mCurrentOffset += numComponents;
     }
     else
     {
-        mCurrentOffset += gl::UniformComponentCount(uniform.type);
+        mCurrentOffset += gl::UniformComponentCount(type);
     }
 }