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, 3 insertions, 18 deletions

diff --git a/gfx/angle/src/compiler/translator/ValidateSwitch.cpp b/gfx/angle/src/compiler/translator/ValidateSwitch.cpp
index 9bcd8f5fe..9a4ed3363 100755
--- a/gfx/angle/src/compiler/translator/ValidateSwitch.cpp
+++ b/gfx/angle/src/compiler/translator/ValidateSwitch.cpp
@@ -8,13 +8,8 @@
 
 #include "compiler/translator/ParseContext.h"
 
-namespace sh
-{
-
-bool ValidateSwitch::validate(TBasicType switchType,
-                              TParseContext *context,
-                              TIntermBlock *statementList,
-                              const TSourceLoc &loc)
+bool ValidateSwitch::validate(TBasicType switchType, TParseContext *context,
+    TIntermAggregate *statementList, const TSourceLoc &loc)
 {
     ValidateSwitch validate(switchType, context);
     ASSERT(statementList);
@@ -64,19 +59,11 @@ bool ValidateSwitch::visitUnary(Visit, TIntermUnary *)
 {
     if (!mFirstCaseFound)
         mStatementBeforeCase = true;
-    mLastStatementWasCase    = false;
-    return true;
-}
-
-bool ValidateSwitch::visitTernary(Visit, TIntermTernary *)
-{
-    if (!mFirstCaseFound)
-        mStatementBeforeCase = true;
     mLastStatementWasCase = false;
     return true;
 }
 
-bool ValidateSwitch::visitIfElse(Visit visit, TIntermIfElse *)
+bool ValidateSwitch::visitSelection(Visit visit, TIntermSelection *)
 {
     if (visit == PreVisit)
         ++mControlFlowDepth;
@@ -211,5 +198,3 @@ bool ValidateSwitch::validateInternal(const TSourceLoc &loc)
     return !mStatementBeforeCase && !mLastStatementWasCase && !mCaseInsideControlFlow &&
         !mCaseTypeMismatch && mDefaultCount <= 1 && !mDuplicateCases;
 }
-
-}  // namespace sh