X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbloom.cpp;h=36cdb8ddfeec2eeb67e940f95521667e549dc78d;hb=f48b68626a98c4a0b8991764d174eb57895e805f;hp=76460b993885cb7f71162d22fe32b306ad650495;hpb=2e7f19b895424c3a77940e648639f8df2b395d0f;p=libs%2Fgl.git

diff --git a/source/bloom.cpp b/source/bloom.cpp
index 76460b99..36cdb8dd 100644
--- a/source/bloom.cpp
+++ b/source/bloom.cpp
@@ -57,16 +57,11 @@ namespace GL {
 
 Bloom::Bloom(unsigned w, unsigned h):
 	blur_shader(blur_vs, blur_fs),
-	blur_shdata_common(blur_shader),
-	blur_shdata_x(blur_shader),
-	blur_shdata_y(blur_shader),
 	combine_shader(combine_vs, combine_fs),
-	combine_shdata(combine_shader),
 	quad(VERTEX2)
 {
-	int loc = blur_shader.get_uniform_location("delta");
-	blur_shdata_x.uniform(loc, 1.0f/w, 0.0f);
-	blur_shdata_y.uniform(loc, 0.0f, 1.0f/h);
+	blur_shdata[0].uniform("delta", 1.0f/w, 0.0f);
+	blur_shdata[1].uniform("delta", 0.0f, 1.0f/h);
 
 	blur_shdata_common.uniform("source", 0);
 	for(unsigned i=0; i<2; ++i)
@@ -130,7 +125,7 @@ void Bloom::render(const Texture2D &src, const Texture2D &)
 		{
 			Bind bind_tex(i ? tex[0] : src);
 			fbo.attach(COLOR_ATTACHMENT0, tex[i], 0);
-			(i ? blur_shdata_y : blur_shdata_x).apply();
+			blur_shdata[i].apply();
 			quad.draw();
 		}
 	}