commit b14178b68ccb44a1fca9ba4e7db7770c6b6b6fa9
author Alexis Hetu <sugoi@google.com> Mon Apr 13 13:23:20 2015 -0400
committer Alexis Hétu <sugoi@google.com> Wed Apr 15 17:37:55 2015 +0000
tree 0f6a7b6c8273d1ef68e673af3b60a648af01b6bd
parent f9b7cb1b9c80fe285bbc0acf867f2e666828f82f

Completing GLES 3.0 language parser

Added new matrix and sampler types in
glslang parsed files, along with related
code and new types in the C++ code.

Change-Id: Id70c73fac04d000d508236bc9bf1b39a46beda6f
Reviewed-on: https://swiftshader-review.googlesource.com/2826
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

src/OpenGL/compiler/intermOut.cpp

diff --git a/src/OpenGL/compiler/intermOut.cpp b/src/OpenGL/compiler/intermOut.cpp
index c9da525..f71eea4 100644
--- a/src/OpenGL/compiler/intermOut.cpp
+++ b/src/OpenGL/compiler/intermOut.cpp
@@ -44,10 +44,10 @@
         stream << getQualifierString() << " " << getPrecisionString() << " ";
     if (array)
         stream << "array of ";
-    if (matrix)
-        stream << size << "X" << size << " matrix of ";
-    else if (size > 1)
-        stream << size << "-component vector of ";
+    if (isMatrix())
+        stream << primarySize << "X" << secondarySize << " matrix of ";
+	else if(primarySize > 1)
+		stream << primarySize << "-component vector of ";
 
     stream << getBasicString();
     return stream.str();