Fix small issues in array related AST transformations

Make sure that user-defined bit stays in place when copying function call nodes, and that mInFunctionWithArrayReturnValue gets reset correctly in ArrayReturnValueToOutParameter. BUG=angleproject:971 TEST=WebGL 2 conformance tests Change-Id: I385f4ce4990597e44ddad4f0fa6db23b661771dc Reviewed-on: https://chromium-review.googlesource.com/273110Tested-by: Olli Etuaho <oetuaho@nvidia.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Zhenyao Mo <zmo@chromium.org>

Fix small issues in array related AST transformations
a357236f · Olli Etuaho · 113bc73e · a357236f · a357236f
Commit a357236f authored May 22, 2015 by Olli Etuaho
Showing with 5 additions and 1 deletion

ArrayReturnValueToOutParameter.cpp src/compiler/translator/ArrayReturnValueToOutParameter.cpp +1 -1

SeparateExpressionsReturningArrays.cpp ...ompiler/translator/SeparateExpressionsReturningArrays.cpp +4 -0

No files found.
--- a/src/compiler/translator/ArrayReturnValueToOutParameter.cpp
+++ b/src/compiler/translator/ArrayReturnValueToOutParameter.cpp
@@ -118,7 +118,7 @@ bool ArrayReturnValueToOutParameterTraverser::visitAggregate(Visit visit, TInter
    }
    else if (visit == PostVisit)
    {
-        if (node->getOp() == EOpFunction && node->isArray())
+        if (node->getOp() == EOpFunction)
        {
            mInFunctionWithArrayReturnValue = false;
        }

--- a/src/compiler/translator/SeparateExpressionsReturningArrays.cpp
+++ b/src/compiler/translator/SeparateExpressionsReturningArrays.cpp
@@ -61,6 +61,10 @@ TIntermAggregate *CopyAggregateNode(TIntermAggregate *node)
    copySeq->insert(copySeq->begin(), node->getSequence()->begin(), node->getSequence()->end());
    copyNode->setType(node->getType());
    copyNode->setFunctionId(node->getFunctionId());
+    if (node->isUserDefined())
+    {
+        copyNode->setUserDefined();
+    }
    copyNode->setName(node->getName());
    return copyNode;
 }