commit a9f524721275997023ba2b05fa4744a653fbfc60
author Jamie Madill <jmadill@transgaming.com> Thu Jun 06 11:56:43 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:04:45 2013 -0400
tree 650af48d65565e12d582d13b6615587b678906aa
parent 74eb9155ca5e8458c6f407eb81ae6c49049ce5d3

Fix matrix accessor getCols to correct getNominalSize in code that could trigger a debug assertion failure.

Was breaking the ES2-CTS build test in Debug mode.

TRAC #23263

Signed-off-by: Geoff Lang
Signed-off-by: Shannon Woods
Author: Jamie Madill

src/compiler/OutputHLSL.cpp

diff --git a/src/compiler/OutputHLSL.cpp b/src/compiler/OutputHLSL.cpp
index b7e63fc..b638e12 100644
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/OutputHLSL.cpp
@@ -3169,7 +3169,7 @@
                 {
                     remainingComponents -= parameter.getObjectSize();
                 }
-                else if (remainingComponents < parameter.getCols())
+                else if (remainingComponents < parameter.getNominalSize())
                 {
                     switch (remainingComponents)
                     {