X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpipeline.cpp;h=fd638fb6ebbbbdd0a95a78caa57586d67b7660bf;hb=58e3368ddb21de5c4bc6e208440de369fe4876f1;hp=59e6bbb843c40bbf470087eb63b7bf9a8fa9f987;hpb=812c37a8aef84f8720a3e1efedebecd993ec75b2;p=libs%2Fgl.git

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index 59e6bbb8..fd638fb6 100644
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -49,8 +49,17 @@ void Pipeline::set_multisample(unsigned s)
 	if(s==samples)
 		return;
 
+	unsigned old_samples = samples;
 	samples = s;
-	create_targets(1);
+	try
+	{
+		create_targets(1);
+	}
+	catch(...)
+	{
+		samples = old_samples;
+		throw;
+	}
 }
 
 void Pipeline::set_camera(const Camera *c)
@@ -137,10 +146,12 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
 	if(!in_frame)
 		setup_frame();
 
+	const Framebuffer *out_fbo = Framebuffer::current();
+	// XXX Make sure the correct FBO is restored if an exception is thrown
+
 	if(target[0])
 	{
 		Framebuffer &fbo = (samples ? target_ms->fbo : target[0]->fbo);
-		// XXX exception safety
 		fbo.bind();
 		fbo.clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
 	}
@@ -149,13 +160,15 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
 	{
 		Bind bind_depth_test(i->get_depth_test());
 		Bind bind_blend(i->get_blend());
-		Bind bind_lighting(i->get_lighting());
+		renderer.set_lighting(i->get_lighting());
 
 		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());
 	}
 
+	renderer.end();
+
 	if(target[0])
 	{
 		if(samples)
@@ -167,11 +180,11 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
 			if(i+1<postproc.size())
 				target[1-j]->fbo.bind();
 			else
-				Framebuffer::unbind();
+				out_fbo->bind();
 			postproc[i]->render(target[j]->color, target[j]->depth);
 		}
 
-		Framebuffer::unbind();
+		out_fbo->bind();
 	}
 
 	if(!was_in_frame)