X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpipeline.cpp;h=fd638fb6ebbbbdd0a95a78caa57586d67b7660bf;hb=9f25c3632cfd5c669a2ad24255e2e85dfa1cb460;hp=c6260f0ee73f15d060436ec99edf3d71aa57a3bf;hpb=0119ca4f792dc761e5248b76de71f2844c0e3997;p=libs%2Fgl.git

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index c6260f0e..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)
@@ -138,9 +147,7 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
 		setup_frame();
 
 	const Framebuffer *out_fbo = Framebuffer::current();
-	/* Binding the current object is a no-op, but this will restore the original
-	FBO in case an exception is thrown. */
-	Bind restore_fbo(out_fbo, true);
+	// XXX Make sure the correct FBO is restored if an exception is thrown
 
 	if(target[0])
 	{
@@ -153,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)