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

diff --git a/source/effects/bloom.cpp b/source/effects/bloom.cpp
index af2057d9..8b973b30 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;
 
@@ -69,8 +67,8 @@ 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_framebuffer(&target[i]->get_framebuffer());
 		renderer.set_texture("source", (i ? &target[0]->get_target_texture(RENDER_COLOR) : &src), &nearest_sampler);
 		renderer.add_shader_data(blur_shdata[i]);
 		quad.draw(renderer);
@@ -82,6 +80,19 @@ void Bloom::render(Renderer &renderer, const Texture2D &src, const Texture2D &)
 	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),