X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fpipeline.cpp;h=8517805e23197aef724029280d0684cdadde2ec6;hp=570014d3692e4ab1405e22761b90511a02379020;hb=7f888de83aa5398fafaa7661547ee80395377b5c;hpb=90a26a1740d5843b60d07d9c39d8567bfed5189c

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index 570014d3..8517805e 100644
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -28,9 +28,13 @@ Pipeline::Pipeline(unsigned w, unsigned h, bool d):
 	width(w),
 	height(h),
 	hdr(d),
+	samples(0),
 	fbo(0),
 	color_buf(0),
-	depth_buf(0)
+	depth_buf(0),
+	fbo_ms(0),
+	color_buf_ms(0),
+	depth_buf_ms(0)
 { }
 
 Pipeline::~Pipeline()
@@ -40,6 +44,20 @@ Pipeline::~Pipeline()
 	delete depth_buf;
 }
 
+void Pipeline::set_hdr(bool h)
+{
+	hdr = h;
+	if(!postproc.empty())
+		create_fbos();
+}
+
+void Pipeline::set_multisample(unsigned s)
+{
+	samples = s;
+	if(!postproc.empty())
+		create_fbos();
+}
+
 void Pipeline::set_camera(const Camera *c)
 {
 	camera = c;
@@ -115,22 +133,8 @@ void Pipeline::add_postprocessor(PostProcessor &pp)
 {
 	postproc.push_back(&pp);
 	if(!fbo)
+		create_fbos();
 	{
-		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);
 	}
 }
 
@@ -160,8 +164,9 @@ void Pipeline::render_all() const
 
 	if(fbo)
 	{
-		fbo->bind();
-		fbo->clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
+		Framebuffer *f = (fbo_ms ? fbo_ms : fbo);
+		f->bind();
+		f->clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
 	}
 
 	for(vector<Effect *>::const_iterator i=effects.begin(); i!=effects.end(); ++i)
@@ -175,13 +180,60 @@ void Pipeline::render_all() const
 		(*--i)->cleanup();
 
 	if(fbo)
+	{
+		if(fbo_ms)
+			fbo->blit_from(*fbo_ms, COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT, false);
 		Framebuffer::unbind();
+	}
 
 	// 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);
 }
 
+void Pipeline::create_fbos()
+{
+	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)
+	{
+		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);
+
+		depth_buf_ms = new Renderbuffer;
+		depth_buf_ms->storage_multisample(samples, DEPTH_COMPONENT, width, height);
+		fbo_ms->attach(DEPTH_ATTACHMENT, *depth_buf_ms);
+	}
+}
+
 
 Pipeline::Slot::Slot(const Renderable *r):
 	renderable(r)