setup_frame();
const Framebuffer *out_fbo = Framebuffer::current();
- // XXX Make sure the correct FBO is restored if an exception is thrown
+ // These is a no-ops but will ensure the related state gets restored
+ BindRestore restore_fbo(out_fbo);
+ BindRestore restore_depth_test(DepthTest::current());
+ BindRestore restore_blend(Blend::current());
if(target[0])
{
- Framebuffer &fbo = (samples ? target_ms->fbo : target[0]->fbo);
+ Framebuffer &fbo = (samples ? target_ms : target[0])->get_framebuffer();
fbo.bind();
fbo.clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
}
+
for(PassList::const_iterator i=passes.begin(); i!=passes.end(); ++i)
{
- Bind bind_depth_test(i->get_depth_test());
- Bind bind_blend(i->get_blend());
+ if(const DepthTest *dt = i->get_depth_test())
+ dt->bind();
+ else
+ DepthTest::unbind();
+
+ if(const Blend *b = i->get_blend())
+ b->bind();
+ else
+ Blend::unbind();
+
renderer.set_lighting(i->get_lighting());
renderer.set_clipping(i->get_clipping());
renderer.render(*j->renderable, i->get_tag());
}
- renderer.end();
-
if(target[0])
{
+ DepthTest::unbind();
+ Blend::unbind();
+
if(samples)
- target[0]->fbo.blit_from(target_ms->fbo, COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT, false);
+ target[0]->blit_from(*target_ms);
for(unsigned i=0; i<postproc.size(); ++i)
{
unsigned j = i%2;
if(i+1<postproc.size())
- target[1-j]->fbo.bind();
+ target[1-j]->get_framebuffer().bind();
else
out_fbo->bind();
- postproc[i]->render(target[j]->color, target[j]->depth);
+ const Texture2D &color = target[j]->get_target_texture(RENDER_COLOR);
+ const Texture2D &depth = target[j]->get_target_texture(RENDER_DEPTH);
+ postproc[i]->render(renderer, color, depth);
}
-
- out_fbo->bind();
}
if(!was_in_frame)
target_ms = 0;
}
- PixelFormat fmt = (hdr ? RGB16F : RGB);
+ PixelFormat color_pf = (hdr ? RGB16F : RGB);
+ RenderTargetFormat fmt = (RENDER_COLOR,color_pf, RENDER_DEPTH);
if(!postproc.empty() || samples)
{
if(!target[0])
}
if(!target_ms && samples)
- target_ms = new MultisampleTarget(width, height, samples, fmt);
+ target_ms = new RenderTarget(width, height, samples, fmt);
}
renderable(r)
{ }
-
-Pipeline::RenderTarget::RenderTarget(unsigned w, unsigned h, PixelFormat f)
-{
- color.set_min_filter(NEAREST);
- color.set_mag_filter(NEAREST);
- color.set_wrap(CLAMP_TO_EDGE);
- color.storage(f, w, h);
- fbo.attach(COLOR_ATTACHMENT0, color, 0);
-
- depth.set_min_filter(NEAREST);
- depth.set_mag_filter(NEAREST);
- depth.set_wrap(CLAMP_TO_EDGE);
- depth.storage(DEPTH_COMPONENT, w, h);
- fbo.attach(DEPTH_ATTACHMENT, depth, 0);
-
- fbo.require_complete();
-}
-
-
-Pipeline::MultisampleTarget::MultisampleTarget(unsigned w, unsigned h, unsigned s, PixelFormat f)
-{
- color.storage_multisample(s, f, w, h);
- fbo.attach(COLOR_ATTACHMENT0, color);
-
- depth.storage_multisample(s, DEPTH_COMPONENT, w, h);
- fbo.attach(DEPTH_ATTACHMENT, depth);
-
- fbo.require_complete();
-}
-
} // namespace GL
} // namespace Msp