1 files changed, 14 insertions, 20 deletions
diff --git a/src/3rdparty/angle/src/compiler/translator/RegenerateStructNames.cpp b/src/3rdparty/angle/src/compiler/translator/RegenerateStructNames.cpp
index 5e0db2ad26..55fb124a42 100644
--- a/src/3rdparty/angle/src/compiler/translator/RegenerateStructNames.cpp
+++ b/src/3rdparty/angle/src/compiler/translator/RegenerateStructNames.cpp
@@ -7,6 +7,9 @@
 #include "common/debug.h"
 #include "compiler/translator/RegenerateStructNames.h"
 
+namespace sh
+{
+
 void RegenerateStructNames::visitSymbol(TIntermSymbol *symbol)
 {
     ASSERT(symbol);
@@ -16,7 +19,7 @@ void RegenerateStructNames::visitSymbol(TIntermSymbol *symbol)
     if (!userType)
         return;
 
-    if (mSymbolTable.findBuiltIn(userType->name(), mShaderVersion))
+    if (mSymbolTable->findBuiltIn(userType->name(), mShaderVersion))
     {
         // Built-in struct, do not touch it.
         return;
@@ -53,30 +56,21 @@ void RegenerateStructNames::visitSymbol(TIntermSymbol *symbol)
         return;
     }
     std::string id = Str(uniqueId);
-    TString tmp = kPrefix + TString(id.c_str());
+    TString tmp    = kPrefix + TString(id.c_str());
     tmp += "_" + userType->name();
     userType->setName(tmp);
 }
 
-bool RegenerateStructNames::visitAggregate(Visit, TIntermAggregate *aggregate)
+bool RegenerateStructNames::visitBlock(Visit, TIntermBlock *block)
 {
-    ASSERT(aggregate);
-    switch (aggregate->getOp())
+    ++mScopeDepth;
+    TIntermSequence &sequence = *(block->getSequence());
+    for (TIntermNode *node : sequence)
     {
-      case EOpSequence:
-        ++mScopeDepth;
-        {
-            TIntermSequence &sequence = *(aggregate->getSequence());
-            for (size_t ii = 0; ii < sequence.size(); ++ii)
-            {
-                TIntermNode *node = sequence[ii];
-                ASSERT(node != NULL);
-                node->traverse(this);
-            }
-        }
-        --mScopeDepth;
-        return false;
-      default:
-        return true;
+        node->traverse(this);
     }
+    --mScopeDepth;
+    return false;
 }
+
+}  // namespace sh