Merge branch 'ANGLE-rollback'

This resolves #624

Note: Cherry-picked some fixes on top of the ANGLE version that we want to keep.

1 files changed, 1 insertions, 6 deletions

diff --git a/gfx/angle/src/compiler/translator/ForLoopUnroll.cpp b/gfx/angle/src/compiler/translator/ForLoopUnroll.cpp
index 58cce845f..4cc1c26a1 100755
--- a/gfx/angle/src/compiler/translator/ForLoopUnroll.cpp
+++ b/gfx/angle/src/compiler/translator/ForLoopUnroll.cpp
@@ -9,9 +9,6 @@
 #include "compiler/translator/ValidateLimitations.h"
 #include "angle_gl.h"
 
-namespace sh
-{
-
 bool ForLoopUnrollMarker::visitBinary(Visit, TIntermBinary *node)
 {
     if (mUnrollCondition != kSamplerArrayIndex)
@@ -54,7 +51,7 @@ bool ForLoopUnrollMarker::visitLoop(Visit, TIntermLoop *node)
         // Check if loop index type is integer.
         // This is called after ValidateLimitations pass, so the loop has the limited form specified
         // in ESSL 1.00 appendix A.
-        TIntermSequence *declSeq = node->getInit()->getAsDeclarationNode()->getSequence();
+        TIntermSequence *declSeq = node->getInit()->getAsAggregate()->getSequence();
         TIntermSymbol *symbol = (*declSeq)[0]->getAsBinaryNode()->getLeft()->getAsSymbolNode();
         if (symbol->getBasicType() == EbtInt)
             node->setUnrollFlag(true);
@@ -98,5 +95,3 @@ void ForLoopUnrollMarker::visitSymbol(TIntermSymbol* symbol)
         }
     }
 }
-
-}  // namespace sh