Check the flat qualifier from the correct member

[libs/gl.git] / source / effects / bloom.cpp

diff --git a/source/effects/bloom.cpp b/source/effects/bloom.cpp
index af2057d908a03afa25075330ddbbfe0b2ef6f0d5..b9b63bcbc1d3505758dd347ae869fe29be98b554 100644 (file)
--- a/source/effects/bloom.cpp
+++ b/source/effects/bloom.cpp
@@ -1,13 +1,10 @@
 #include <cmath>
 #include <msp/strings/format.h>
-#include "blend.h"
 #include "bloom.h"
-#include "misc.h"
+#include "mesh.h"
 #include "renderer.h"
 #include "resources.h"
-#include "shader.h"
-#include "tests.h"
-#include "texunit.h"
+#include "texture2d.h"
 
 using namespace std;
 
@@ -25,7 +22,7 @@ Bloom::Bloom(unsigned w, unsigned h):
        blur_shdata[1].uniform("delta", 0.0f, 1.0f/h);
 
        for(unsigned i=0; i<2; ++i)
-               target[i] = new RenderTarget(w, h, (RENDER_COLOR,RGB16F));
+               target[i] = new RenderTarget(w, h, (COLOR_ATTACHMENT,RGBA16F));
 
        set_radius(2.0f);
        set_strength(0.2f);
@@ -69,24 +66,36 @@ void Bloom::render(Renderer &renderer, const Texture2D &src, const Texture2D &)
        renderer.set_shader_program(&blur_shader, &common_shdata);
        for(unsigned i=0; i<2; ++i)
        {
-               BindRestore bind_fbo(target[i]->get_framebuffer());
                Renderer::Push push2(renderer);
-               renderer.set_texture("source", (i ? &target[0]->get_target_texture(RENDER_COLOR) : &src), &nearest_sampler);
+               renderer.set_pipeline_key(this, i);
+               renderer.set_framebuffer(&target[i]->get_framebuffer());
+               renderer.clear(0);
+               renderer.set_texture("source", (i ? &target[0]->get_target_texture(COLOR_ATTACHMENT) : &src), &nearest_sampler);
                renderer.add_shader_data(blur_shdata[i]);
                quad.draw(renderer);
        }
 
+       renderer.set_pipeline_key(this, 2);
+       renderer.clear(0);
        renderer.set_texture("source", &src, &nearest_sampler);
-       renderer.set_texture("blurred", &target[1]->get_target_texture(RENDER_COLOR), &linear_sampler);
+       renderer.set_texture("blurred", &target[1]->get_target_texture(COLOR_ATTACHMENT), &linear_sampler);
        renderer.set_shader_program(&combine_shader);
        quad.draw(renderer);
 }
 
+void Bloom::set_debug_name(const string &name)
+{
+#ifdef DEBUG
+       for(unsigned i=0; i<2; ++i)
+               target[i]->set_debug_name(format("%s [RT:%d]", name, i));
+       common_shdata.set_debug_name(name+" [UBO:common]");
+       blur_shdata[0].set_debug_name(name+" [UBO:blur_x]");
+       blur_shdata[1].set_debug_name(name+" [UBO:blur_y]");
+#else
+       (void)name;
+#endif
+}
 
-Bloom::Template::Template():
-       radius(2.0f),
-       strength(0.2f)
-{ }
 
 Bloom *Bloom::Template::create(unsigned width, unsigned height) const
 {