Set mUsesDiscardRewriting more conservatively

src/compiler/translator/NodeSearch.h

@@ -53,28 +53,6 @@ class FindDiscard : public NodeSearchTraverser<FindDiscard>
     }
 };
 
-class FindSideEffectRewriting : public NodeSearchTraverser<FindSideEffectRewriting>
-{
-  public:
-    virtual bool visitBinary(Visit visit, TIntermBinary *node)
-    {
-        switch (node->getOp())
-        {
-          case EOpLogicalOr:
-          case EOpLogicalAnd:
-            if (node->getRight()->hasSideEffects())
-            {
-                mFound = true;
-            }
-            break;
-
-          default: break;
-        }
-
-        return !mFound;
-    }
-};
-
 }
 
 #endif // COMPILER_TRANSLATOR_NODESEARCH_H_

src/compiler/translator/OutputHLSL.cpp

@@ -2320,7 +2320,7 @@ void OutputHLSL::writeSelection(TIntermSelection *node)
     }
 
     // ANGLE issue 486: Detect problematic conditional discard
-    if (discard && FindSideEffectRewriting::search(node))
+    if (discard)
     {
         mUsesDiscardRewriting = true;
     }