commit bb22e508f367b742b8c8ff48c43237b908255fa3
author Jamie Madill <jmadill@transgaming.com> Thu Jun 20 11:55:51 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:05:03 2013 -0400
tree 9ba29385cb8d35c85c7037b2431309bad854e5ef
parent d1e78c9cf69e98abdf4b8bbc385b951ab3b99d4b

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

src/libGLESv2/ProgramBinary.cpp

diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp
index 8c83988..eead8ab 100644
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -2080,7 +2080,7 @@
 
             mLinkedAttribute[location] = *attribute;
 
-            int rows = VariableRowCount(attribute->type);
+            int rows = AttributeRegisterCount(attribute->type);
 
             if (rows + location > MAX_VERTEX_ATTRIBS)
             {
@@ -2120,7 +2120,7 @@
     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++)
         {