commit 7da9850643f55335a13a4663d226c73d0ac4d3b1
author Olli Etuaho <oetuaho@nvidia.com> Wed Jul 20 18:45:09 2016 +0300
committer Commit Bot <commit-bot@chromium.org> Thu Jul 21 19:45:49 2016 +0000
tree 7d94b7f306db2b4f3ab7718463663e3e723c11d5
parent e1d199bb9bfcf4d377608a52d5c0889be99724f9

Cover vector dynamic indexing case in SplitSequenceOperator

Vectors or matrices that are dynamically indexed as a part of an
l-value generate new statements in the RemoveDynamicIndexing AST
transformation step. SplitSequenceOperator needs to detect this case
and split the sequence operator before statements are generated from
its operands to ensure the correct order of execution.

BUG=angleproject:1341
TEST=angle_end2end_tests

Change-Id: I84e41a59c88fb5d0111669cab60312b930531a22
Reviewed-on: https://chromium-review.googlesource.com/361695
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

src/compiler/translator/RemoveDynamicIndexing.cpp

diff --git a/src/compiler/translator/RemoveDynamicIndexing.cpp b/src/compiler/translator/RemoveDynamicIndexing.cpp
index 74814f2..35f6c10 100644
--- a/src/compiler/translator/RemoveDynamicIndexing.cpp
+++ b/src/compiler/translator/RemoveDynamicIndexing.cpp
@@ -11,6 +11,7 @@
 
 #include "compiler/translator/InfoSink.h"
 #include "compiler/translator/IntermNode.h"
+#include "compiler/translator/IntermNodePatternMatcher.h"
 #include "compiler/translator/SymbolTable.h"
 
 namespace
@@ -408,10 +409,18 @@
             NodeUpdateEntry replaceIndex(node, node->getRight(), tempIndex, false);
             mReplacements.push_back(replaceIndex);
         }
-        else if (!node->getLeft()->isArray() && node->getLeft()->getBasicType() != EbtStruct)
+        else if (IntermNodePatternMatcher::IsDynamicIndexingOfVectorOrMatrix(node))
         {
             bool write = isLValueRequiredHere();
 
+#if defined(ANGLE_ENABLE_ASSERTS)
+            // Make sure that IntermNodePatternMatcher is consistent with the slightly differently
+            // implemented checks in this traverser.
+            IntermNodePatternMatcher matcher(
+                IntermNodePatternMatcher::kDynamicIndexingOfVectorOrMatrixInLValue);
+            ASSERT(matcher.match(node, getParentNode(), isLValueRequiredHere()) == write);
+#endif
+
             TType type = node->getLeft()->getType();
             mIndexedVecAndMatrixTypes.insert(type);