X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbloom.cpp;h=733b14a2e5a0fe5245c4b7a362bbc802f6b40916;hb=3b159edbe4e80a2bc19c4c2fcd42cb996b9fbfe0;hp=2160e147cb1b8877f1a657f7f15651362ebf26fa;hpb=072bbbd579cb82b4571cbb6babebe6e5ea498356;p=libs%2Fgl.git

diff --git a/source/bloom.cpp b/source/bloom.cpp
index 2160e147..733b14a2 100644
--- a/source/bloom.cpp
+++ b/source/bloom.cpp
@@ -3,6 +3,7 @@
 #include "blend.h"
 #include "bloom.h"
 #include "misc.h"
+#include "renderer.h"
 #include "shader.h"
 #include "tests.h"
 #include "texunit.h"
@@ -65,27 +66,26 @@ void Bloom::set_strength(float s)
 	combine_shdata.uniform("strength", s);
 }
 
-void Bloom::render(const Texture2D &src, const Texture2D &)
+void Bloom::render(Renderer &renderer, const Texture2D &src, const Texture2D &)
 {
-	Bind bind_mesh(quad);
-
 	{
-		Bind bind_shader(blur_shader);
-		blur_shdata_common.apply();
+		Renderer::Push push(renderer);
+		renderer.set_shader_program(&blur_shader, &blur_shdata_common);
 		for(unsigned i=0; i<2; ++i)
 		{
 			BindRestore bind_fbo(fbo[i]);
-			Bind bind_tex(i ? tex[0] : src);
-			blur_shdata[i].apply();
-			quad.draw();
+			Renderer::Push push2(renderer);
+			renderer.set_texture(i ? &tex[0] : &src);
+			renderer.add_shader_data(blur_shdata[i]);
+			quad.draw(renderer);
 		}
 	}
 
+	Renderer::Push push(renderer);
 	combine_texturing.attach(1, src);
-	Bind bind_texturing(combine_texturing);
-	Bind bind_shader(combine_shader);
-	combine_shdata.apply();
-	quad.draw();
+	renderer.set_texturing(&combine_texturing);
+	renderer.set_shader_program(&combine_shader, &combine_shdata);
+	quad.draw(renderer);
 }
 
 } // namespace GL