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/210881Tested-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Nicolas Capens <capn@chromium.org>

Fix non-square scalar-to-matrix constructors.
cf3af0bd · Jamie Madill · e744834a · cf3af0bd
Commit cf3af0bd authored Aug 01, 2014 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

StructureHLSL.cpp src/compiler/translator/StructureHLSL.cpp +2 -2

No files found.
--- a/src/compiler/translator/StructureHLSL.cpp
+++ b/src/compiler/translator/StructureHLSL.cpp
@@ -291,9 +291,9 @@ void StructureHLSL::addConstructor(const TType &type, const TString &name, const

        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");