commit 010fffa86409db3a3a86752a93e4046ec8e780fe
author Jamie Madill <jmadill@transgaming.com> Thu Jun 20 11:55:53 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:05:05 2013 -0400
tree 5c62d214644105999b9a89f66c1ea651a0d71369
parent 099c0f33a06c76e99ab5496b8cb2eeeb93138865

Pass matrix packing qualifier data back from the shader translator to the GLES API.

TRAC #23271

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

src/compiler/Uniform.cpp

diff --git a/src/compiler/Uniform.cpp b/src/compiler/Uniform.cpp
index 3cd3599..ff933f2 100644
--- a/src/compiler/Uniform.cpp
+++ b/src/compiler/Uniform.cpp
@@ -28,13 +28,14 @@
 {
 }
 
-Uniform::Uniform(GLenum type, GLenum precision, const char *name, unsigned int arraySize, unsigned int registerIndex)
+Uniform::Uniform(GLenum type, GLenum precision, const char *name, unsigned int arraySize, unsigned int registerIndex, bool isRowMajorMatrix)
 {
     this->type = type;
     this->precision = precision;
     this->name = name;
     this->arraySize = arraySize;
     this->registerIndex = registerIndex;
+    this->isRowMajorMatrix = isRowMajorMatrix;
 }
 
 BlockMemberInfo::BlockMemberInfo(int offset, int arrayStride, int matrixStride, bool isRowMajorMatrix)
@@ -73,9 +74,6 @@
 {
     const size_t componentSize = 4;
 
-    // TODO: row major matrices
-    bool isRowMajorMatrix = false;
-
     for (unsigned int fieldIndex = 0; fieldIndex < fields.size(); fieldIndex++)
     {
         int arrayStride;
@@ -85,7 +83,7 @@
 
         if (getBlockLayoutInfo(uniform, currentOffset, &arrayStride, &matrixStride))
         {
-            const BlockMemberInfo memberInfo(*currentOffset * componentSize, arrayStride * componentSize, matrixStride * componentSize, isRowMajorMatrix);
+            const BlockMemberInfo memberInfo(*currentOffset * componentSize, arrayStride * componentSize, matrixStride * componentSize, uniform.isRowMajorMatrix);
             blockInfo.push_back(memberInfo);
 
             if (uniform.arraySize > 0)
@@ -95,8 +93,8 @@
 
             if (gl::IsMatrixType(uniform.type))
             {
-                const int componentGroups = (isRowMajorMatrix ? gl::VariableRowCount(uniform.type) : gl::VariableColumnCount(uniform.type));
-                const int numComponents = (isRowMajorMatrix ? gl::VariableColumnCount(uniform.type) : gl::VariableRowCount(uniform.type));
+                const int componentGroups = (uniform.isRowMajorMatrix ? gl::VariableRowCount(uniform.type) : gl::VariableColumnCount(uniform.type));
+                const int numComponents = (uniform.isRowMajorMatrix ? gl::VariableColumnCount(uniform.type) : gl::VariableRowCount(uniform.type));
                 *currentOffset += matrixStride * (componentGroups - 1);
                 *currentOffset += numComponents;
             }
@@ -150,8 +148,6 @@
     const unsigned int registerSize = 4;
     const size_t componentSize = 4;
 
-    // TODO: row major matrices
-    bool isRowMajorMatrix = false;
     // We assume we are only dealing with 4 byte components (no doubles or half-words currently)
     ASSERT(gl::UniformComponentSize(gl::UniformComponentType(uniform.type)) == componentSize);
     int matrixStride = 0;
@@ -164,7 +160,7 @@
 
         if (uniform.arraySize > 0)
         {
-            const int componentGroups = (isRowMajorMatrix ? gl::VariableRowCount(uniform.type) : gl::VariableColumnCount(uniform.type));
+            const int componentGroups = (uniform.isRowMajorMatrix ? gl::VariableRowCount(uniform.type) : gl::VariableColumnCount(uniform.type));
             arrayStride = matrixStride * componentGroups;
         }
     }
@@ -194,9 +190,6 @@
 
     const size_t componentSize = 4;
 
-    // TODO: row major matrices
-    bool isRowMajorMatrix = false;
-
     // We assume we are only dealing with 4 byte components (no doubles or half-words currently)
     ASSERT(gl::UniformComponentSize(gl::UniformComponentType(uniform.type)) == componentSize);
 
@@ -207,13 +200,13 @@
 
     if (gl::IsMatrixType(uniform.type))
     {
-        numComponents = (isRowMajorMatrix ? gl::VariableColumnCount(uniform.type) : gl::VariableRowCount(uniform.type));
+        numComponents = (uniform.isRowMajorMatrix ? gl::VariableColumnCount(uniform.type) : gl::VariableRowCount(uniform.type));
         baseAlignment = rx::roundUp(baseAlignment, 4u);
         matrixStride = baseAlignment;
 
         if (uniform.arraySize > 0)
         {
-            const int componentGroups = (isRowMajorMatrix ? gl::VariableRowCount(uniform.type) : gl::VariableColumnCount(uniform.type));
+            const int componentGroups = (uniform.isRowMajorMatrix ? gl::VariableRowCount(uniform.type) : gl::VariableColumnCount(uniform.type));
             arrayStride = matrixStride * componentGroups;
         }
     }