Fix API reported packing rules for matrices and arrays in shared layout to be consistent with HLSL.

HLSL does not round up the final array/matrix block to the register alignment, allowing for more compact order. TRAC #22856 Signed-off-by: Geoff Lang Signed-off-by: Shannon Woods Authored-by: Jamie Madill

Fix API reported packing rules for matrices and arrays in shared layout to be consistent with HLSL.
62431836 · Jamie Madill · Shannon Woods · acdd70f4 · 62431836
Commit 62431836 authored Jun 10, 2013 by Jamie Madill Committed by Shannon Woods Jul 19, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

Uniform.cpp src/compiler/Uniform.cpp +7 -4

No files found.
--- a/src/compiler/Uniform.cpp
+++ b/src/compiler/Uniform.cpp
@@ -73,12 +73,15 @@ void InterfaceBlock::getBlockLayoutInfo(const sh::ActiveUniforms &fields, unsign

            if (uniform.arraySize > 0)
            {
-                *currentOffset += arrayStride * uniform.arraySize;
+                *currentOffset += arrayStride * (uniform.arraySize - 1);
            }
-            else if (gl::IsMatrixType(uniform.type))
+
+            if (gl::IsMatrixType(uniform.type))
            {
                const int componentGroups = (isRowMajorMatrix ? gl::VariableRowCount(uniform.type) : gl::VariableColumnCount(uniform.type));
-                *currentOffset += matrixStride * componentGroups;
+                const int numComponents = (isRowMajorMatrix ? gl::VariableColumnCount(uniform.type) : gl::VariableRowCount(uniform.type));
+                *currentOffset += matrixStride * (componentGroups - 1);
+                *currentOffset += numComponents;
            }
            else
            {
@@ -156,7 +159,7 @@ void InterfaceBlock::getD3DLayoutInfo(const sh::Uniform &uniform, unsigned int *
    else
    {
        int numComponents = gl::UniformComponentCount(uniform.type);
-        if ((numComponents + (*currentOffset % registerSize)) >= registerSize)
+        if ((numComponents + (*currentOffset % registerSize)) > registerSize)
        {
            *currentOffset = rx::roundUp(*currentOffset, registerSize);
        }