Pass the resource collection to async loaders

[libs/gl.git] / source / pipeline.cpp

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index 0df03ca7df7231931874355f855de9c3284cd148..bcbbb05fe3b63aa0064c6e71db0fa5142f28d867 100644 (file)
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -40,8 +40,17 @@ void Pipeline::set_hdr(bool h)
        if(h==hdr)
                return;
 
+       bool old_hdr= hdr;
        hdr = h;
-       create_targets(2);
+       try
+       {
+               create_targets(2);
+       }
+       catch(...)
+       {
+               hdr = old_hdr;
+               throw;
+       }
 }
 
 void Pipeline::set_multisample(unsigned s)
@@ -49,8 +58,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)
@@ -102,7 +120,15 @@ void Pipeline::remove_renderable(const Renderable &r)
 void Pipeline::add_postprocessor(PostProcessor &pp)
 {
        postproc.push_back(&pp);
-       create_targets(0);
+       try
+       {
+               create_targets(0);
+       }
+       catch(...)
+       {
+               postproc.pop_back();
+               throw;
+       }
 }
 
 void Pipeline::setup_frame() const
@@ -138,9 +164,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])
        {
@@ -160,6 +184,8 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
                                renderer.render(*j->renderable, i->get_tag());
        }
 
+       renderer.end();
+
        if(target[0])
        {
                if(samples)