Refactor FunctionInliner to do any necessary declaration reordering

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

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index d8b1813959f17e4535ea1ea8c60001c22a36d76f..9bbd4914b1a0a289caa3c48a3504fa6c79e0c11d 100644 (file)
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -200,6 +200,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