Add support for arrays as function return values in GLSL output

Output the array brackets and the array size correctly when a function's return value type is array. Tested with WebGL 2 test sdk/tests/deqp/data/gles3/shaders/arrays.html BUG=angleproject:971 TEST=WebGL 2 conformance tests Change-Id: I63aa8c54d2696f65351b23acb0749a487298ddfb Reviewed-on: https://chromium-review.googlesource.com/265410Tested-by: Olli Etuaho <oetuaho@nvidia.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>

Add support for arrays as function return values in GLSL output
ab6fc6a2 · Olli Etuaho · 4a1858b8 · ab6fc6a2
Commit ab6fc6a2 authored Apr 13, 2015 by Olli Etuaho
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 2 deletions

OutputGLSLBase.cpp src/compiler/translator/OutputGLSLBase.cpp +14 -2

No files found.
--- a/src/compiler/translator/OutputGLSLBase.cpp
+++ b/src/compiler/translator/OutputGLSLBase.cpp
@@ -777,7 +777,13 @@ bool TOutputGLSLBase::visitAggregate(Visit visit, TIntermAggregate *node)
      case EOpPrototype:
        // Function declaration.
        ASSERT(visit == PreVisit);
-        writeVariableType(node->getType());
+        {
+            const TType &type = node->getType();
+            writeVariableType(type);
+            if (type.isArray())
+                out << arrayBrackets(type);
+        }
+
        out << " " << hashFunctionName(node->getName());

        out << "(";
@@ -789,7 +795,13 @@ bool TOutputGLSLBase::visitAggregate(Visit visit, TIntermAggregate *node)
      case EOpFunction: {
        // Function definition.
        ASSERT(visit == PreVisit);
-        writeVariableType(node->getType());
+        {
+            const TType &type = node->getType();
+            writeVariableType(type);
+            if (type.isArray())
+                out << arrayBrackets(type);
+        }
+
        out << " " << hashFunctionName(node->getName());

        incrementDepth(node);