X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fbloom.cpp;h=aac226d90c133a9a174b25ca0fb1d0a715bfc9b4;hb=b877c737bc5f759e6da25f886ad965e4a274cf2a;hp=8b973b30fc3943af479720e14b86231642cf41a0;hpb=ce3658993ce2f6b7527a04a36a5e1af349c6f2e9;p=libs%2Fgl.git

diff --git a/source/effects/bloom.cpp b/source/effects/bloom.cpp
index 8b973b30..aac226d9 100644
--- a/source/effects/bloom.cpp
+++ b/source/effects/bloom.cpp
@@ -2,10 +2,8 @@
 #include <msp/strings/format.h>
 #include "blend.h"
 #include "bloom.h"
-#include "misc.h"
 #include "renderer.h"
 #include "resources.h"
-#include "shader.h"
 
 using namespace std;
 
@@ -23,7 +21,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 +67,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);
 }