X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpipeline.cpp;h=466aa23c69b6b3107457817f8efea8f33aa829ac;hb=f657e545d461948f9d014d65c7546b26671f2828;hp=bfd7bc679c6d69c4432d8f3d52a83003c4b16157;hpb=f48b68626a98c4a0b8991764d174eb57895e805f;p=libs%2Fgl.git

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index bfd7bc67..466aa23c 100644
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -21,7 +21,8 @@ Pipeline::Pipeline(unsigned w, unsigned h, bool d):
 	height(h),
 	hdr(d),
 	samples(0),
-	target_ms(0)
+	target_ms(0),
+	in_frame(false)
 {
 	target[0] = 0;
 	target[1] = 0;
@@ -98,6 +99,20 @@ void Pipeline::add_postprocessor(PostProcessor &pp)
 	create_targets(false);
 }
 
+void Pipeline::setup_frame() const
+{
+	in_frame = true;
+	for(vector<Slot>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+		i->renderable->setup_frame();
+}
+
+void Pipeline::finish_frame() const
+{
+	in_frame = false;
+	for(vector<Slot>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+		i->renderable->finish_frame();
+}
+
 void Pipeline::render(const Tag &tag) const
 {
 	if(tag.id)
@@ -112,6 +127,10 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
 	if(tag.id)
 		return;
 
+	bool was_in_frame = in_frame;
+	if(!in_frame)
+		setup_frame();
+
 	if(target[0])
 	{
 		Framebuffer &fbo = (samples ? target_ms->fbo : target[0]->fbo);
@@ -128,7 +147,7 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
 
 		for(vector<Slot>::const_iterator j=renderables.begin(); j!=renderables.end(); ++j)
 			if(j->passes.empty() || j->passes.count(i->get_tag()))
-				j->renderable->render(renderer, i->get_tag());
+				renderer.render(*j->renderable, i->get_tag());
 	}
 
 	if(target[0])
@@ -148,6 +167,9 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
 
 		Framebuffer::unbind();
 	}
+
+	if(!was_in_frame)
+		finish_frame();
 }
 
 void Pipeline::create_targets(bool recreate)