X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fbloom.cpp;h=fc087d4ce19dbd5293dbdf53b40345ff52490dad;hb=6353307898cd397e2bcde13e2448a8a678a60004;hp=8612ec06e8e10d6ba871143bc58568336c7aa38e;hpb=1863f17c5c5563be8492d7f01e5c613a740ea1e9;p=libs%2Fgl.git

diff --git a/source/effects/bloom.cpp b/source/effects/bloom.cpp
index 8612ec06..fc087d4c 100644
--- a/source/effects/bloom.cpp
+++ b/source/effects/bloom.cpp
@@ -6,8 +6,6 @@
 #include "renderer.h"
 #include "resources.h"
 #include "shader.h"
-#include "tests.h"
-#include "texunit.h"
 
 using namespace std;
 
@@ -25,7 +23,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,15 +67,15 @@ 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_framebuffer(&target[i]->get_framebuffer());
+		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);
 }