commit 283c2194dc1433cb6b543d89a844fd74590b704e
author Olli Etuaho <oetuaho@nvidia.com> Mon Oct 23 17:11:50 2017 +0300
committer Commit Bot <commit-bot@chromium.org> Tue Oct 24 08:18:53 2017 +0000
tree 627e336534f2b197019d3fb630c1020fa6f491b2
parent e7c2857dbe8835cc38faba90805918cb625c00f1

Support arrays of arrays in UseInterfaceBlockFields

This can be tested more fully once parsing arrays of arrays will be
supported.

BUG=angleproject:2125

Change-Id: I89c8f33b8cca5d6f5aa3f20aab23dccac53a956f
Reviewed-on: https://chromium-review.googlesource.com/733128
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

src/compiler/translator/UseInterfaceBlockFields.cpp

diff --git a/src/compiler/translator/UseInterfaceBlockFields.cpp b/src/compiler/translator/UseInterfaceBlockFields.cpp
index 78529dc..40bd42a 100644
--- a/src/compiler/translator/UseInterfaceBlockFields.cpp
+++ b/src/compiler/translator/UseInterfaceBlockFields.cpp
@@ -22,33 +22,31 @@
 namespace
 {
 
+void AddNodeUseStatements(TIntermTyped *node, TIntermSequence *sequence)
+{
+    if (node->isArray())
+    {
+        for (unsigned int i = 0u; i < node->getOutermostArraySize(); ++i)
+        {
+            TIntermBinary *element =
+                new TIntermBinary(EOpIndexDirect, node->deepCopy(), CreateIndexNode(i));
+            AddNodeUseStatements(element, sequence);
+        }
+    }
+    else
+    {
+        sequence->insert(sequence->begin(), node);
+    }
+}
+
 void AddFieldUseStatements(const ShaderVariable &var,
                            TIntermSequence *sequence,
                            const TSymbolTable &symbolTable)
 {
     TString name = TString(var.name.c_str());
-    if (var.isArray())
-    {
-        size_t pos = name.find_last_of('[');
-        if (pos != TString::npos)
-        {
-            name = name.substr(0, pos);
-        }
-    }
+    ASSERT(name.find_last_of('[') == TString::npos);
     TIntermSymbol *symbol = ReferenceGlobalVariable(name, symbolTable);
-    if (var.isArray())
-    {
-        for (unsigned int i = 0u; i < var.arraySize; ++i)
-        {
-            TIntermBinary *element =
-                new TIntermBinary(EOpIndexDirect, symbol->deepCopy(), CreateIndexNode(i));
-            sequence->insert(sequence->begin(), element);
-        }
-    }
-    else
-    {
-        sequence->insert(sequence->begin(), symbol);
-    }
+    AddNodeUseStatements(symbol, sequence);
 }
 
 void InsertUseCode(const InterfaceBlock &block, TIntermTyped *blockNode, TIntermSequence *sequence)