Rewrite Bind as two different classes

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

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