commit d2f59bb6dda4f3548e158a09540829f9ff56bba4
author Jamie Madill <jmadill@chromium.org> Wed Aug 17 11:50:52 2016 -0400
committer Jamie Madill <jmadill@chromium.org> Wed Aug 17 17:16:57 2016 +0000
tree f25b61c61711731572495777521171e90b3b0a5a
parent 6c9503ec49fd3ae5e59de7d31f6a9a90469eee6a

Revert "Cover vector dynamic indexing case in SplitSequenceOperator"

This CL was causing inverted rendering in a WebGL application.

This reverts commit 7da9850643f55335a13a4663d226c73d0ac4d3b1.

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: I854f8cce2d46107afa62f48edf3d32c6d5c97eda
Reviewed-on: https://chromium-review.googlesource.com/371643
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/compiler/translator/RemoveDynamicIndexing.cpp

diff --git a/src/compiler/translator/RemoveDynamicIndexing.cpp b/src/compiler/translator/RemoveDynamicIndexing.cpp
index 37955e7..5b6b41b 100644
--- a/src/compiler/translator/RemoveDynamicIndexing.cpp
+++ b/src/compiler/translator/RemoveDynamicIndexing.cpp
@@ -11,7 +11,6 @@
 
 #include "compiler/translator/InfoSink.h"
 #include "compiler/translator/IntermNode.h"
-#include "compiler/translator/IntermNodePatternMatcher.h"
 #include "compiler/translator/SymbolTable.h"
 
 namespace
@@ -406,18 +405,10 @@
             TIntermSymbol *tempIndex = createTempSymbol(node->getRight()->getType());
             queueReplacementWithParent(node, node->getRight(), tempIndex, OriginalNode::IS_DROPPED);
         }
-        else if (IntermNodePatternMatcher::IsDynamicIndexingOfVectorOrMatrix(node))
+        else if (!node->getLeft()->isArray() && node->getLeft()->getBasicType() != EbtStruct)
         {
             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);