commit 8f6eb2ad4859dd37a3048637bcf55b39b7de44fe
author Olli Etuaho <oetuaho@nvidia.com> Thu Jan 12 17:04:58 2017 +0000
committer Commit Bot <commit-bot@chromium.org> Fri Jan 13 10:28:48 2017 +0000
tree 7971fa3c8e4ceb1b660bff0e215c26bd301c9d61
parent 6a6b09c9b62b003ca96b036d0249db5ce99cc269

HLSL output: Fix nested dynamic indexing in an l-value

This fixes cases where a matrix is indexed and then the resulting
vector is indexed in the same expression inside an l-value.

BUG=angleproject:1672
TEST=angle_end2end_tests

Change-Id: Ia0593d75da67e0aa582003e1c381f2a1c89f948c
Reviewed-on: https://chromium-review.googlesource.com/427938
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@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 b51ffa5..d439235 100644
--- a/src/compiler/translator/RemoveDynamicIndexing.cpp
+++ b/src/compiler/translator/RemoveDynamicIndexing.cpp
@@ -433,6 +433,18 @@
                     mRemoveIndexSideEffectsInSubtree = true;
                     return true;
                 }
+
+                TIntermBinary *leftBinary = node->getLeft()->getAsBinaryNode();
+                if (leftBinary != nullptr &&
+                    IntermNodePatternMatcher::IsDynamicIndexingOfVectorOrMatrix(leftBinary))
+                {
+                    // This is a case like:
+                    // mat2 m;
+                    // m[a][b]++;
+                    // Process the child node m[a] first.
+                    return true;
+                }
+
                 // TODO(oetuaho@nvidia.com): This is not optimal if the expression using the value
                 // only writes it and doesn't need the previous value. http://anglebug.com/1116