Cache renderables in SimpleScene into a vector

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

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index 0546a4e847829f33844cf6236db2047816ba0b2f..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)
@@ -111,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
@@ -167,7 +184,7 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
                                renderer.render(*j->renderable, i->get_tag());
        }
 
-       renderer.escape();
+       renderer.end();
 
        if(target[0])
        {