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

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index bfd7bc67..59e6bbb8 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;
@@ -36,14 +37,20 @@ Pipeline::~Pipeline()
 
 void Pipeline::set_hdr(bool h)
 {
+	if(h==hdr)
+		return;
+
 	hdr = h;
-	create_targets(true);
+	create_targets(2);
 }
 
 void Pipeline::set_multisample(unsigned s)
 {
+	if(s==samples)
+		return;
+
 	samples = s;
-	create_targets(false);
+	create_targets(1);
 }
 
 void Pipeline::set_camera(const Camera *c)
@@ -95,7 +102,21 @@ void Pipeline::remove_renderable(const Renderable &r)
 void Pipeline::add_postprocessor(PostProcessor &pp)
 {
 	postproc.push_back(&pp);
-	create_targets(false);
+	create_targets(0);
+}
+
+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
@@ -112,6 +133,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 +153,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,25 +173,34 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
 
 		Framebuffer::unbind();
 	}
+
+	if(!was_in_frame)
+		finish_frame();
 }
 
-void Pipeline::create_targets(bool recreate)
+void Pipeline::create_targets(unsigned recreate)
 {
-	if(recreate)
+	if(recreate>=2)
 	{
 		delete target[0];
 		delete target[1];
-		delete target_ms;
 		target[0] = 0;
 		target[1] = 0;
+	}
+	if(recreate>=1)
+	{
+		delete target_ms;
 		target_ms = 0;
 	}
 
 	PixelFormat fmt = (hdr ? RGB16F : RGB);
-	if(!target[0])
-		target[0] = new RenderTarget(width, height, fmt);
-	if(!target[1] && postproc.size()>1)
-		target[1] = new RenderTarget(width, height, fmt);
+	if(!postproc.empty() || samples)
+	{
+		if(!target[0])
+			target[0] = new RenderTarget(width, height, fmt);
+		if(!target[1] && postproc.size()>1)
+			target[1] = new RenderTarget(width, height, fmt);
+	}
 
 	if(!target_ms && samples)
 		target_ms = new MultisampleTarget(width, height, samples, fmt);
@@ -214,6 +248,8 @@ Pipeline::RenderTarget::RenderTarget(unsigned w, unsigned h, PixelFormat f)
 	depth.set_wrap(CLAMP_TO_EDGE);
 	depth.storage(DEPTH_COMPONENT, w, h);
 	fbo.attach(DEPTH_ATTACHMENT, depth, 0);
+
+	fbo.require_complete();
 }
 
 
@@ -224,6 +260,8 @@ Pipeline::MultisampleTarget::MultisampleTarget(unsigned w, unsigned h, unsigned
 
 	depth.storage_multisample(s, DEPTH_COMPONENT, w, h);
 	fbo.attach(DEPTH_ATTACHMENT, depth);
+
+	fbo.require_complete();
 }
 
 } // namespace GL