commit f4e39bfdcb6a9eeff9a94de81eafb31a158356f7
author Jamie Madill <jmadill@chromium.org> Fri Aug 01 17:22:17 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Mon Aug 04 15:37:27 2014 +0000
tree ebf7d77e9831c869cbf9cbbb0fbf33717c16e95c
parent cf3af0bdbc5772fc638b1ba1111650105f0a315d

Fix non-square matrix-to-matrix constructors.

This fixes some broken tests in dEQP:
functional.shaders.conversions.matrix_to_matrix

BUG=angle:712

Change-Id: I0538595f2913a2c1d4f0da901d65d608a6580d19
Reviewed-on: https://chromium-review.googlesource.com/210882
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Nicolas Capens <capn@chromium.org>

src/compiler/translator/StructureHLSL.cpp

diff --git a/src/compiler/translator/StructureHLSL.cpp b/src/compiler/translator/StructureHLSL.cpp
index cdd10c5..7aaf47c 100644
--- a/src/compiler/translator/StructureHLSL.cpp
+++ b/src/compiler/translator/StructureHLSL.cpp
@@ -306,13 +306,13 @@
         }
         else if (parameter.isMatrix())
         {
-            for (int row = 0; row < rows; row++)
+            for (int col = 0; col < cols; col++)
             {
-                for (int col = 0; col < cols; col++)
+                for (int row = 0; row < rows; row++)
                 {
                     if (row < parameter.getRows() && col < parameter.getCols())
                     {
-                        constructor += TString("x0") + "[" + str(row) + "][" + str(col) + "]";
+                        constructor += TString("x0") + "[" + str(col) + "][" + str(row) + "]";
                     }
                     else
                     {