Add loader support for clipping in standard shaders

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

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index 59e6bbb843c40bbf470087eb63b7bf9a8fa9f987..1833001ff1288fb00257450fe694bd9e44ae62a1 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
@@ -137,10 +163,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 +177,16 @@ 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());
+               renderer.set_clipping(i->get_clipping());
 
                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 +198,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)
@@ -211,7 +242,8 @@ Pipeline::Pass::Pass(const Tag &t):
        tag(t),
        lighting(0),
        depth_test(0),
-       blend(0)
+       blend(0),
+       clipping(0)
 { }
 
 void Pipeline::Pass::set_lighting(const Lighting *l)
@@ -229,6 +261,11 @@ void Pipeline::Pass::set_blend(const Blend *b)
        blend = b;
 }
 
+void Pipeline::Pass::set_clipping(const Clipping *c)
+{
+       clipping =c;
+}
+
 
 Pipeline::Slot::Slot(const Renderable *r):
        renderable(r)