X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fglsl%2Fvisitor.cpp;h=fa6e614c6394a1705e4d45b6214fc55efbc760a1;hb=69680f4d284cdf7b16a2966250a88ab1257862f3;hp=fd25bf342a7ea588525be88079166453474c4e8e;hpb=7daccf2582084283a9e5064995f674eef835996e;p=libs%2Fgl.git

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index fd25bf34..fa6e614c 100644
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -7,12 +7,6 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-void NodeVisitor::visit(Assignment &assign)
-{
-	visit(static_cast<BinaryExpression &>(assign));
-}
-
-
 void TraversingVisitor::visit(Block &block)
 {
 	if(&block!=current_block)
@@ -43,6 +37,11 @@ void TraversingVisitor::visit(BinaryExpression &binary)
 	binary.right->visit(*this);
 }
 
+void TraversingVisitor::visit(Assignment &assign)
+{
+	visit(static_cast<BinaryExpression &>(assign));
+}
+
 void TraversingVisitor::visit(FunctionCall &call)
 {
 	for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
@@ -103,9 +102,9 @@ void TraversingVisitor::visit(Iteration &iter)
 		iter.init_statement->visit(*this);
 	if(iter.condition)
 		iter.condition->visit(*this);
+	iter.body.visit(*this);
 	if(iter.loop_expression)
 		iter.loop_expression->visit(*this);
-	iter.body.visit(*this);
 }
 
 void TraversingVisitor::visit(Passthrough &pass)
@@ -186,6 +185,13 @@ void NodeRemover::visit(InterfaceBlock &iface)
 	TraversingVisitor::visit(iface);
 }
 
+void NodeRemover::visit(FunctionDeclaration &func)
+{
+	if(to_remove->count(&func))
+		remove_from_map(stage->functions, func.name, func);
+	TraversingVisitor::visit(func);
+}
+
 void NodeRemover::visit(Iteration &iter)
 {
 	if(to_remove->count(iter.init_statement.get()))
@@ -193,6 +199,39 @@ void NodeRemover::visit(Iteration &iter)
 	TraversingVisitor::visit(iter);
 }
 
+
+NodeReorderer::NodeReorderer():
+	reorder_before(0),
+	to_reorder(0)
+{ }
+
+void NodeReorderer::apply(Stage &stage, Node &before, const set<Node *> &tr)
+{
+	reorder_before = &before;
+	to_reorder = &tr;
+	stage.content.visit(*this);
+}
+
+void NodeReorderer::visit(Block &block)
+{
+	NodeList<Statement>::iterator insert_point = block.body.end();
+	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
+	{
+		(*i)->visit(*this);
+		if(insert_point!=block.body.end() && to_reorder->count(i->get()))
+		{
+			NodeList<Statement>::iterator j = i++;
+			block.body.splice(insert_point, block.body, j);
+		}
+		else
+		{
+			if(i->get()==reorder_before)
+				insert_point = i;
+			++i;
+		}
+	}
+}
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp