commit d8edb5184c59f1b8aa0a44df8432b08c77a3a0de
author Geoff Lang <geofflang@chromium.org> Wed Sep 02 11:52:56 2015 -0400
committer Geoff Lang <geofflang@chromium.org> Thu Sep 03 19:33:35 2015 +0000
tree 981f65a0cc201bf4d00b13021d41fe6ddfcdc370
parent 6e36042f7ea5da40dd4611ec9ce0aabc455ba826

Allow OutputGLSL to write non-square matrices.

Fixes assertion failures when ShaderGL fails to compile the generated shaders.

BUG=angleproject:882
BUG=angleproject:1149

Change-Id: Ib7c23a54bdb81852864d792f29c89644084859a3
Reviewed-on: https://chromium-review.googlesource.com/297085
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/compiler/translator/OutputGLSLBase.cpp

diff --git a/src/compiler/translator/OutputGLSLBase.cpp b/src/compiler/translator/OutputGLSLBase.cpp
index 3c98b56..63b2813 100644
--- a/src/compiler/translator/OutputGLSLBase.cpp
+++ b/src/compiler/translator/OutputGLSLBase.cpp
@@ -1190,6 +1190,10 @@
     {
         out << "mat";
         out << type.getNominalSize();
+        if (type.getSecondarySize() != type.getNominalSize())
+        {
+            out << "x" << type.getSecondarySize();
+        }
     }
     else if (type.isVector())
     {