Handled case where selection nodes that use ternary operators are part of a…

Handled case where selection nodes that use ternary operators are part of a sequence. Usually they are part of an assignment. BUG=4 TEST=OpenGL ES 2.0 conformance tests, specifically operators test. Review URL: http://codereview.appspot.com/1643043 git-svn-id: https://angleproject.googlecode.com/svn/trunk@335 736b8ea6-26fd-11df-bfd4-992fa37f6226

Handled case where selection nodes that use ternary operators are part of a…
334aa1f3 · alokp@chromium.org · 7d3849bd · 334aa1f3
Commit 334aa1f3 authored Jun 11, 2010 by alokp@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

OutputGLSL.cpp src/compiler/OutputGLSL.cpp +8 -8

No files found.
--- a/src/compiler/OutputGLSL.cpp
+++ b/src/compiler/OutputGLSL.cpp
@@ -47,18 +47,18 @@ TString arrayBrackets(const TType& type)
 }
 bool isSingleStatement(TIntermNode* node) {
-    const TIntermAggregate* aggregate = node->getAsAggregate();
+    if (const TIntermAggregate* aggregate = node->getAsAggregate())
-    if (aggregate != NULL)
    {
-        if ((aggregate->getOp() == EOpFunction) ||
+        return (aggregate->getOp() != EOpFunction) &&
-            (aggregate->getOp() == EOpSequence))
+               (aggregate->getOp() != EOpSequence);
-            return false;
    }
-    else if (node->getAsSelectionNode() != NULL)
+    else if (const TIntermSelection* selection = node->getAsSelectionNode())
    {
-        return false;
+        // Ternary operators are usually part of an assignment operator.
+        // This handles those rare cases in which they are all by themselves.
+        return selection->usesTernaryOperator();
    }
-    else if (node->getAsLoopNode() != NULL)
+    else if (node->getAsLoopNode())
    {
        return false;
    }