Added TIntermSelection::usesTernaryOperator() to distinguish between selection…

src/compiler/OutputGLSL.cpp

@@ -285,23 +285,35 @@ bool TOutputGLSL::visitSelection(Visit visit, TIntermSelection* node)
 {
     TInfoSinkBase& out = objSink();
 
-    out << "if (";
-    node->getCondition()->traverse(this);
-    out << ") {\n";
-
-    incrementDepth();
-    node->getTrueBlock()->traverse(this);
-    out << getIndentationString(depth - 2) << "}";
-
-    if (node->getFalseBlock())
+    if (node->usesTernaryOperator())
     {
-        out << " else {\n";
+        out << "(";
+        node->getCondition()->traverse(this);
+        out << ") ? (";
+        node->getTrueBlock()->traverse(this);
+        out << ") : (";
         node->getFalseBlock()->traverse(this);
-        out << getIndentationString(depth - 2) << "}";
+        out << ")";
     }
-    decrementDepth();
+    else
+    {
+        out << "if (";
+        node->getCondition()->traverse(this);
+        out << ") {\n";
 
-    out << "\n";
+        incrementDepth();
+        node->getTrueBlock()->traverse(this);
+        out << getIndentationString(depth - 2) << "}";
+
+        if (node->getFalseBlock())
+        {
+            out << " else {\n";
+            node->getFalseBlock()->traverse(this);
+            out << getIndentationString(depth - 2) << "}";
+        }
+        decrementDepth();
+        out << "\n";
+    }
     return false;
 }
 

src/compiler/OutputHLSL.cpp

@@ -956,7 +956,17 @@ bool OutputHLSL::visitSelection(Visit visit, TIntermSelection *node)
 {
     TInfoSinkBase &out = context.infoSink.obj;
 
-    if (node->getType().getBasicType() == EbtVoid)   // if/else statement
+    if (node->usesTernaryOperator())
+    {
+        out << "(";
+        node->getCondition()->traverse(this);
+        out << ") ? (";
+        node->getTrueBlock()->traverse(this);
+        out << ") : (";
+        node->getFalseBlock()->traverse(this);
+        out << ")\n";
+    }
+    else  // if/else statement
     {
         out << "if(";
 
@@ -979,16 +989,6 @@ bool OutputHLSL::visitSelection(Visit visit, TIntermSelection *node)
             out << ";}\n";
         }
     }
-    else   // Ternary operator expression
-    {
-        out << "(";
-        node->getCondition()->traverse(this);
-        out << ") ? (";
-        node->getTrueBlock()->traverse(this);
-        out << ") : (";
-        node->getFalseBlock()->traverse(this);
-        out << ")\n";
-    }
 
     return false;
 }

src/compiler/intermediate.h

@@ -417,6 +417,7 @@ public:
 	TIntermSelection(TIntermTyped* cond, TIntermNode* trueB, TIntermNode* falseB, const TType& type) :
 		TIntermTyped(type), condition(cond), trueBlock(trueB), falseBlock(falseB) {}
 	virtual void traverse(TIntermTraverser*);
+        bool usesTernaryOperator() const { return getBasicType() != EbtVoid; }
 	virtual TIntermNode* getCondition() const { return condition; }
 	virtual TIntermNode* getTrueBlock() const { return trueBlock; }
 	virtual TIntermNode* getFalseBlock() const { return falseBlock; }