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, 7 insertions, 14 deletions

diff --git a/gfx/angle/src/compiler/translator/RemoveSwitchFallThrough.h b/gfx/angle/src/compiler/translator/RemoveSwitchFallThrough.h
index fd8bf4fa2..db8699327 100755
--- a/gfx/angle/src/compiler/translator/RemoveSwitchFallThrough.h
+++ b/gfx/angle/src/compiler/translator/RemoveSwitchFallThrough.h
@@ -9,42 +9,35 @@
 
 #include "compiler/translator/IntermNode.h"
 
-namespace sh
-{
-
 class RemoveSwitchFallThrough : public TIntermTraverser
 {
   public:
     // When given a statementList from a switch AST node, return an updated
     // statementList that has fall-through removed.
-    static TIntermBlock *removeFallThrough(TIntermBlock *statementList);
+    static TIntermAggregate *removeFallThrough(TIntermAggregate *statementList);
 
   private:
-    RemoveSwitchFallThrough(TIntermBlock *statementList);
+    RemoveSwitchFallThrough(TIntermAggregate *statementList);
 
     void visitSymbol(TIntermSymbol *node) override;
     void visitConstantUnion(TIntermConstantUnion *node) override;
     bool visitBinary(Visit, TIntermBinary *node) override;
     bool visitUnary(Visit, TIntermUnary *node) override;
-    bool visitTernary(Visit visit, TIntermTernary *node) override;
-    bool visitIfElse(Visit visit, TIntermIfElse *node) override;
+    bool visitSelection(Visit visit, TIntermSelection *node) override;
     bool visitSwitch(Visit, TIntermSwitch *node) override;
     bool visitCase(Visit, TIntermCase *node) override;
     bool visitAggregate(Visit, TIntermAggregate *node) override;
-    bool visitBlock(Visit, TIntermBlock *node) override;
     bool visitLoop(Visit, TIntermLoop *node) override;
     bool visitBranch(Visit, TIntermBranch *node) override;
 
     void outputSequence(TIntermSequence *sequence, size_t startIndex);
     void handlePreviousCase();
 
-    TIntermBlock *mStatementList;
-    TIntermBlock *mStatementListOut;
+    TIntermAggregate *mStatementList;
+    TIntermAggregate *mStatementListOut;
     bool mLastStatementWasBreak;
-    TIntermBlock *mPreviousCase;
-    std::vector<TIntermBlock *> mCasesSharingBreak;
+    TIntermAggregate *mPreviousCase;
+    std::vector<TIntermAggregate *> mCasesSharingBreak;
 };
 
-}  // namespace sh
-
 #endif // COMPILER_TRANSLATOR_REMOVESWITCHFALLTHROUGH_H_