Implement the ternary operator in GLSL

[libs/gl.git] / source / glsl / visitor.cpp

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index 8c8056c56352c99a56ca3a7e5b21e298026e5fbe..5da89f54e69b608d1202f13fd2bdbced0a787f72 100644 (file)
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -53,6 +53,13 @@ void TraversingVisitor::visit(Assignment &assign)
        visit(assign.right);
 }
 
+void TraversingVisitor::visit(TernaryExpression &ternary)
+{
+       visit(ternary.condition);
+       visit(ternary.true_expr);
+       visit(ternary.false_expr);
+}
+
 void TraversingVisitor::visit(FunctionCall &call)
 {
        for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
@@ -200,7 +207,11 @@ void NodeRemover::visit(InterfaceBlock &iface)
 void NodeRemover::visit(FunctionDeclaration &func)
 {
        if(to_remove->count(&func))
+       {
                remove_from_map(stage->functions, func.name, func);
+               if(!func.signature.empty())
+                       remove_from_map(stage->functions, func.name+func.signature, func);
+       }
        TraversingVisitor::visit(func);
 }