From 072bbbd579cb82b4571cbb6babebe6e5ea498356 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sat, 26 Nov 2016 07:29:20 +0200 Subject: [PATCH] Ensure that DepthTest and Blend get unbound for PostProcessors --- source/ambientocclusion.cpp | 2 -- source/bloom.cpp | 2 -- source/pipeline.cpp | 20 +++++++++++++++++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/source/ambientocclusion.cpp b/source/ambientocclusion.cpp index bad204a9..5aba53dd 100644 --- a/source/ambientocclusion.cpp +++ b/source/ambientocclusion.cpp @@ -72,8 +72,6 @@ void AmbientOcclusion::render(const Texture2D &color, const Texture2D &depth) combine_texturing.attach(0, depth); combine_texturing.attach(1, color); - BindRestore unbind_dtest(static_cast(0)); - BindRestore unbind_blend(static_cast(0)); Bind bind_mesh(quad); { diff --git a/source/bloom.cpp b/source/bloom.cpp index 58edc65d..2160e147 100644 --- a/source/bloom.cpp +++ b/source/bloom.cpp @@ -67,8 +67,6 @@ void Bloom::set_strength(float s) void Bloom::render(const Texture2D &src, const Texture2D &) { - BindRestore unbind_dtest(static_cast(0)); - BindRestore unbind_blend(static_cast(0)); Bind bind_mesh(quad); { diff --git a/source/pipeline.cpp b/source/pipeline.cpp index e3da0530..92d80a97 100644 --- a/source/pipeline.cpp +++ b/source/pipeline.cpp @@ -176,8 +176,10 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const setup_frame(); const Framebuffer *out_fbo = Framebuffer::current(); - // This is a no-op but will ensure the FBO binding gets restored + // 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]) { @@ -186,10 +188,19 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const 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()); @@ -205,6 +216,9 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const if(target[0]) { + BindRestore unbind_depth_test(static_cast(0)); + BindRestore unbind_blend(static_cast(0)); + if(samples) target[0]->fbo.blit_from(target_ms->fbo, COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT, false); -- 2.43.0