Remove some vestigial code from Sequence

[libs/gl.git] / source / render / sequence.cpp

diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp
index 6898e6688f793438cd553ea73e60ea9688df4e93..b8fb6076e1fe5937ee8107aece475b5d3a763c44 100644 (file)
--- a/source/render/sequence.cpp
+++ b/source/render/sequence.cpp
@@ -140,20 +140,16 @@ void Sequence::add_postprocessor(PostProcessor *pp, bool keep)
 
 void Sequence::setup_frame(Renderer &renderer)
 {
-       for(StepList::const_iterator i=steps.begin(); i!=steps.end(); ++i)
+       for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
                if(Renderable *renderable = i->get_renderable())
                        renderable->setup_frame(renderer);
-       for(vector<Slot>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-               i->renderable->setup_frame(renderer);
 }
 
 void Sequence::finish_frame()
 {
-       for(StepList::const_iterator i=steps.begin(); i!=steps.end(); ++i)
+       for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
                if(Renderable *renderable = i->get_renderable())
                        renderable->finish_frame();
-       for(vector<Slot>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-               i->renderable->finish_frame();
 }
 
 void Sequence::render(Renderer &renderer, Tag tag) const
@@ -174,7 +170,7 @@ void Sequence::render(Renderer &renderer, Tag tag) const
                fbo.clear();
        }
 
-       for(StepList::const_iterator i=steps.begin(); i!=steps.end(); ++i)
+       for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
        {
                if(const DepthTest *dt = i->get_depth_test())
                        dt->bind();
@@ -191,10 +187,6 @@ void Sequence::render(Renderer &renderer, Tag tag) const
 
                if(const Renderable *renderable = i->get_renderable())
                        renderer.render(*renderable, i->get_tag());
-
-               for(vector<Slot>::const_iterator j=renderables.begin(); j!=renderables.end(); ++j)
-                       if(j->passes.empty() || j->passes.count(i->get_tag()))
-                               renderer.render(*j->renderable, i->get_tag());
        }
 
        if(target[0])
@@ -278,10 +270,5 @@ void Sequence::Step::set_clipping(const Clipping *c)
        clipping =c;
 }
 
-
-Sequence::Slot::Slot(Renderable *r):
-       renderable(r)
-{ }
-
 } // namespace GL
 } // namespace Msp