X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fpipeline.cpp;h=27cc3e3c63cc9d274e3573c7da915b21b846899d;hp=67ddf6566cf3592422490f3f61343f094beb8286;hb=bb162b9edd4b8c0e9faeed75da4148f5b9735450;hpb=5eb4e7ebd0dc36bc0d9817dedcc152f3bd581f70

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index 67ddf656..27cc3e3c 100644
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -9,48 +9,77 @@
 #include "renderer.h"
 #include "tests.h"
 #include "texture2d.h"
+#include "view.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
-Pipeline::Pipeline(unsigned w, unsigned h, bool d):
-	camera(0),
-	width(w),
-	height(h),
-	hdr(d),
-	samples(0),
-	fbo(0),
-	color_buf(0),
-	depth_buf(0),
-	fbo_ms(0),
-	color_buf_ms(0),
-	depth_buf_ms(0)
-{ }
+Pipeline::Pipeline(unsigned w, unsigned h, bool d)
+{
+	init(w, h);
+	hdr = d;
+}
+
+Pipeline::Pipeline(const View &view)
+{
+	init(view.get_width(), view.get_height());
+}
+
+void Pipeline::init(unsigned w, unsigned h)
+{
+	camera = 0;
+	width = w;
+	height = h;
+	hdr = false;
+	samples = 0;
+	target_ms = 0;
+	target[0] = 0;
+	target[1] = 0;
+}
 
 Pipeline::~Pipeline()
 {
-	delete fbo;
-	delete color_buf;
-	delete depth_buf;
-	delete fbo_ms;
-	delete color_buf_ms;
-	delete depth_buf_ms;
+	delete target[0];
+	delete target[1];
+	delete target_ms;
 }
 
 void Pipeline::set_hdr(bool h)
 {
+	if(h==hdr)
+		return;
+
+	bool old_hdr= hdr;
 	hdr = h;
-	if(!postproc.empty())
-		create_fbos();
+	try
+	{
+		create_targets(2);
+	}
+	catch(...)
+	{
+		hdr = old_hdr;
+		throw;
+	}
 }
 
 void Pipeline::set_multisample(unsigned s)
 {
+	if(s==samples)
+		return;
+
+	unsigned old_samples = samples;
 	samples = s;
-	if(!postproc.empty())
-		create_fbos();
+	try
+	{
+		create_targets(1);
+	}
+	catch(...)
+	{
+		samples = old_samples;
+		throw;
+	}
 }
 
 void Pipeline::set_camera(const Camera *c)
@@ -60,11 +89,11 @@ void Pipeline::set_camera(const Camera *c)
 
 Pipeline::Pass &Pipeline::add_pass(const Tag &tag)
 {
-	passes.push_back(Pass(tag));
+	passes.push_back(Pass(tag, 0));
 	return passes.back();
 }
 
-void Pipeline::add_renderable(const Renderable &r)
+void Pipeline::add_renderable(Renderable &r)
 {
 	for(vector<Slot>::iterator i=renderables.begin(); i!=renderables.end(); ++i)
 		if(i->renderable==&r)
@@ -76,7 +105,7 @@ void Pipeline::add_renderable(const Renderable &r)
 	renderables.push_back(&r);
 }
 
-void Pipeline::add_renderable_for_pass(const Renderable &r, const Tag &tag)
+void Pipeline::add_renderable_for_pass(Renderable &r, const Tag &tag)
 {
 	for(vector<Slot>::iterator i=renderables.begin(); i!=renderables.end(); ++i)
 		if(i->renderable==&r)
@@ -89,7 +118,7 @@ void Pipeline::add_renderable_for_pass(const Renderable &r, const Tag &tag)
 	renderables.back().passes.insert(tag);
 }
 
-void Pipeline::remove_renderable(const Renderable &r)
+void Pipeline::remove_renderable(Renderable &r)
 {
 	for(vector<Slot>::iterator i=renderables.begin(); i!=renderables.end(); ++i)
 		if(i->renderable==&r)
@@ -99,22 +128,62 @@ void Pipeline::remove_renderable(const Renderable &r)
 		}
 }
 
+Pipeline::Pass &Pipeline::add_pass(const Tag &tag, Renderable &r)
+{
+	passes.push_back(Pass(tag, &r));
+	return passes.back();
+}
+
 void Pipeline::add_postprocessor(PostProcessor &pp)
 {
-	postproc.push_back(&pp);
-	if(!fbo)
-		create_fbos();
+	add_postprocessor(&pp, true);
+}
+
+void Pipeline::add_postprocessor_owned(PostProcessor *pp)
+{
+	add_postprocessor(pp, false);
+}
+
+void Pipeline::add_postprocessor(PostProcessor *pp, bool keep)
+{
+	postproc.push_back(pp);
+	if(keep)
+		postproc.back().keep();
+	try
+	{
+		create_targets(0);
+	}
+	catch(...)
 	{
+		postproc.pop_back();
+		throw;
 	}
 }
 
-void Pipeline::render(const Tag &tag) const
+void Pipeline::setup_frame(Renderer &renderer)
 {
-	if(tag.id)
-		return;
+	for(PassList::const_iterator i=passes.begin(); i!=passes.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 Pipeline::finish_frame()
+{
+	for(PassList::const_iterator i=passes.begin(); i!=passes.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 Pipeline::render()
+{
 	Renderer renderer(camera);
-	render(renderer, tag);
+	setup_frame(renderer);
+	render(renderer);
+	finish_frame();
 }
 
 void Pipeline::render(Renderer &renderer, const Tag &tag) const
@@ -122,86 +191,101 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
 	if(tag.id)
 		return;
 
-	if(fbo)
+	const Framebuffer *out_fbo = Framebuffer::current();
+	// These are no-ops but will ensure the related state gets restored
+	BindRestore restore_fbo(out_fbo);
+	BindRestore restore_depth_test(DepthTest::current());
+	BindRestore restore_blend(Blend::current());
+
+	if(target[0])
 	{
-		Framebuffer *f = (fbo_ms ? fbo_ms : fbo);
-		// XXX exception safety
-		f->bind();
-		f->clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
+		Framebuffer &fbo = (samples ? target_ms : target[0])->get_framebuffer();
+		fbo.bind();
+		fbo.clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
 	}
 
 	for(PassList::const_iterator i=passes.begin(); i!=passes.end(); ++i)
 	{
-		Bind bind_depth_test(i->get_depth_test());
-		Bind bind_blend(i->get_blend());
-		Bind bind_lighting(i->get_lighting());
+		if(const DepthTest *dt = i->get_depth_test())
+			dt->bind();
+		else
+			DepthTest::unbind();
+
+		if(const Blend *b = i->get_blend())
+			b->bind();
+		else
+			Blend::unbind();
+
+		renderer.set_lighting(i->get_lighting());
+		renderer.set_clipping(i->get_clipping());
+
+		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()))
-				j->renderable->render(renderer, i->get_tag());
+				renderer.render(*j->renderable, i->get_tag());
 	}
 
-	if(fbo)
+	if(target[0])
 	{
-		if(fbo_ms)
-			fbo->blit_from(*fbo_ms, COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT, false);
-		Framebuffer::unbind();
-	}
+		DepthTest::unbind();
+		Blend::unbind();
+
+		if(samples)
+			target[0]->blit_from(*target_ms);
 
-	// XXX Need two color buffer textures to handle multiple post-processors correctly
-	for(vector<PostProcessor *>::const_iterator i=postproc.begin(); i!=postproc.end(); ++i)
-		(*i)->render(*color_buf, *depth_buf);
+		for(unsigned i=0; i<postproc.size(); ++i)
+		{
+			unsigned j = i%2;
+			if(i+1<postproc.size())
+				target[1-j]->get_framebuffer().bind();
+			else
+				out_fbo->bind();
+			const Texture2D &color = target[j]->get_target_texture(RENDER_COLOR);
+			const Texture2D &depth = target[j]->get_target_texture(RENDER_DEPTH);
+			postproc[i]->render(renderer, color, depth);
+		}
+	}
 }
 
-void Pipeline::create_fbos()
+void Pipeline::create_targets(unsigned recreate)
 {
-	delete fbo;
-	delete color_buf;
-	delete depth_buf;
-
-	delete fbo_ms;
-	fbo_ms = 0;
-	delete color_buf_ms;
-	color_buf_ms = 0;
-	delete depth_buf_ms;
-	depth_buf_ms = 0;
-
-	fbo = new Framebuffer;
-
-	color_buf = new Texture2D;
-	color_buf->set_min_filter(NEAREST);
-	color_buf->set_mag_filter(NEAREST);
-	color_buf->set_wrap(CLAMP_TO_EDGE);
-	color_buf->storage((hdr ? RGB16F : RGB), width, height);
-	fbo->attach(COLOR_ATTACHMENT0, *color_buf, 0);
-
-	depth_buf = new Texture2D;
-	depth_buf->set_min_filter(NEAREST);
-	depth_buf->set_mag_filter(NEAREST);
-	depth_buf->set_wrap(CLAMP_TO_EDGE);
-	depth_buf->storage(DEPTH_COMPONENT, width, height);
-	fbo->attach(DEPTH_ATTACHMENT, *depth_buf, 0);
-
-	if(samples)
+	if(recreate>=2)
 	{
-		fbo_ms = new Framebuffer;
-
-		color_buf_ms = new Renderbuffer;
-		color_buf_ms->storage_multisample(samples, (hdr ? RGB16F : RGB), width, height);
-		fbo_ms->attach(COLOR_ATTACHMENT0, *color_buf_ms);
+		delete target[0];
+		delete target[1];
+		target[0] = 0;
+		target[1] = 0;
+	}
+	if(recreate>=1)
+	{
+		delete target_ms;
+		target_ms = 0;
+	}
 
-		depth_buf_ms = new Renderbuffer;
-		depth_buf_ms->storage_multisample(samples, DEPTH_COMPONENT, width, height);
-		fbo_ms->attach(DEPTH_ATTACHMENT, *depth_buf_ms);
+	PixelFormat color_pf = (hdr ? RGB16F : RGB);
+	RenderTargetFormat fmt = (RENDER_COLOR,color_pf, RENDER_DEPTH);
+	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 RenderTarget(width, height, samples, fmt);
 }
 
 
-Pipeline::Pass::Pass(const Tag &t):
+Pipeline::Pass::Pass(const Tag &t, Renderable *r):
 	tag(t),
 	lighting(0),
 	depth_test(0),
-	blend(0)
+	blend(0),
+	clipping(0),
+	renderable(r)
 { }
 
 void Pipeline::Pass::set_lighting(const Lighting *l)
@@ -219,8 +303,13 @@ void Pipeline::Pass::set_blend(const Blend *b)
 	blend = b;
 }
 
+void Pipeline::Pass::set_clipping(const Clipping *c)
+{
+	clipping =c;
+}
+
 
-Pipeline::Slot::Slot(const Renderable *r):
+Pipeline::Slot::Slot(Renderable *r):
 	renderable(r)
 { }