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

diff --git a/source/effects/bloom.cpp b/source/effects/bloom.cpp
index fc087d4c..5204adb7 100644
--- 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, (COLOR_ATTACHMENT,RGB16F));
+		target[i] = new RenderTarget(w, h, (COLOR_ATTACHMENT,RGBA16F));
 
 	set_radius(2.0f);
 	set_strength(0.2f);
@@ -69,11 +68,13 @@ void Bloom::render(Renderer &renderer, const Texture2D &src, const Texture2D &)
 	{
 		Renderer::Push push2(renderer);
 		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.clear(0);
 	renderer.set_texture("source", &src, &nearest_sampler);
 	renderer.set_texture("blurred", &target[1]->get_target_texture(COLOR_ATTACHMENT), &linear_sampler);
 	renderer.set_shader_program(&combine_shader);
@@ -94,11 +95,6 @@ void Bloom::set_debug_name(const string &name)
 }
 
 
-Bloom::Template::Template():
-	radius(2.0f),
-	strength(0.2f)
-{ }
-
 Bloom *Bloom::Template::create(unsigned width, unsigned height) const
 {
 	RefPtr<Bloom> bloom = new Bloom(width/size_divisor, height/size_divisor);