Fix an improper use of VariableRowCount to AttributeRegisterCount in ProgramBinary.

This is a regression from the non-square matrix uniforms implementation. TRAC #23269 Signed-off-by: Geoff Lang Signed-off-by: Nicolas Capens Authored-by: Jamie Madill

Fix an improper use of VariableRowCount to AttributeRegisterCount in ProgramBinary.
bb22e508 · Jamie Madill · Shannon Woods · d1e78c9c · bb22e508
Commit bb22e508 authored Jun 20, 2013 by Jamie Madill Committed by Shannon Woods Jul 19, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ProgramBinary.cpp src/libGLESv2/ProgramBinary.cpp +2 -2

No files found.
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -2080,7 +2080,7 @@ bool ProgramBinary::linkAttributes(InfoLog &infoLog, const AttributeBindings &at
            mLinkedAttribute[location] = *attribute;
-            int rows = VariableRowCount(attribute->type);
+            int rows = AttributeRegisterCount(attribute->type);
            if (rows + location > MAX_VERTEX_ATTRIBS)
            {
@@ -2120,7 +2120,7 @@ bool ProgramBinary::linkAttributes(InfoLog &infoLog, const AttributeBindings &at
    for (int attributeIndex = 0; attributeIndex < MAX_VERTEX_ATTRIBS; )
    {
        int index = vertexShader->getSemanticIndex(mLinkedAttribute[attributeIndex].name);
-        int rows = std::max(AttributeRegisterCount(mLinkedAttribute[attributeIndex].type), 1);
+        int rows = AttributeRegisterCount(mLinkedAttribute[attributeIndex].type);
        for (int r = 0; r < rows; r++)
        {