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

Fix non-square scalar-to-matrix constructors.

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

BUG=angle:712

Change-Id: Ia01d720307ea6ca70da266b2085a878eaaab2412
Reviewed-on: https://chromium-review.googlesource.com/210881
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 365985c..cdd10c5 100644
--- a/src/compiler/translator/StructureHLSL.cpp
+++ b/src/compiler/translator/StructureHLSL.cpp
@@ -291,9 +291,9 @@
 
         if (parameter.isScalar())
         {
-            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++)
                 {
                     constructor += TString((row == col) ? "x0" : "0.0");