Some more cleanup of includes and forward declarations

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

diff --git a/source/effects/bloom.cpp b/source/effects/bloom.cpp
index 8b973b30fc3943af479720e14b86231642cf41a0..a6fefa6ecc014cb68ddcb41e443128f33295e430 100644 (file)
--- a/source/effects/bloom.cpp
+++ b/source/effects/bloom.cpp
@@ -1,11 +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 "texture2d.h"
 
 using namespace std;
 
@@ -23,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,RGB16F));
 
        set_radius(2.0f);
        set_strength(0.2f);
@@ -69,13 +68,13 @@ void Bloom::render(Renderer &renderer, const Texture2D &src, const Texture2D &)
        {
                Renderer::Push push2(renderer);
                renderer.set_framebuffer(&target[i]->get_framebuffer());
-               renderer.set_texture("source", (i ? &target[0]->get_target_texture(RENDER_COLOR) : &src), &nearest_sampler);
+               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_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);
 }