X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbloom.cpp;h=ad7ec26943c4230a97ec0a5f0b30750f7680a22f;hb=78328c5f6e4dcbe883a3f5e4fe0974ab490be3f7;hp=896147c2e885074620866da9e9e8dacb836ad1a6;hpb=86af62e6f5a743a08c04dde873f51802af5982c4;p=libs%2Fgl.git

diff --git a/source/bloom.cpp b/source/bloom.cpp
index 896147c2..ad7ec269 100644
--- a/source/bloom.cpp
+++ b/source/bloom.cpp
@@ -43,11 +43,11 @@ Bloom::Bloom(unsigned w, unsigned h):
 	quad(get_fullscreen_quad())
 {
 	blur_shader.attach_shader(get_fullscreen_vertex_shader());
-	blur_shader.attach_shader_owned(new Shader(FRAGMENT_SHADER, blur_fs));
+	blur_shader.attach_shader_owned(new FragmentShader(blur_fs));
 	blur_shader.link();
 
 	combine_shader.attach_shader(get_fullscreen_vertex_shader());
-	combine_shader.attach_shader_owned(new Shader(FRAGMENT_SHADER, combine_fs));
+	combine_shader.attach_shader_owned(new FragmentShader(combine_fs));
 	combine_shader.link();
 
 	blur_shdata[0].uniform("delta", 1.0f/w, 0.0f);
@@ -57,7 +57,10 @@ Bloom::Bloom(unsigned w, unsigned h):
 	for(unsigned i=0; i<2; ++i)
 	{
 		tex[i].set_min_filter(NEAREST);
+		tex[i].set_wrap(CLAMP_TO_EDGE);
 		tex[i].storage(RGB16F, w, h);
+		fbo[i].attach(COLOR_ATTACHMENT0, tex[i], 0);
+		fbo[i].require_complete();
 	}
 
 	combine_shdata.uniform("source", 1);
@@ -72,7 +75,7 @@ Bloom::Bloom(unsigned w, unsigned h):
 void Bloom::set_radius(float r)
 {
 	if(r<=0.0f)
-		throw out_of_range("Bloom::set_radius");
+		throw invalid_argument("Bloom::set_radius");
 
 	int size = min(static_cast<int>(r*3.0f), 9);
 	blur_shdata_common.uniform("size", size);
@@ -82,15 +85,16 @@ void Bloom::set_radius(float r)
 	r = 2*r*r;
 	for(int i=-size; i<=size; ++i)
 		sum += (factors[size+i] = exp(-i*i/r));
-
 	for(int i=0; i<=size*2; ++i)
-		blur_shdata_common.uniform(format("factors[%d]", i), factors[i]/sum);
+		factors[i] /= sum;
+
+	blur_shdata_common.uniform1_array("factors[0]", size*2+1, &factors.front());
 }
 
 void Bloom::set_strength(float s)
 {
 	if(s<0.0f || s>1.0f)
-		throw out_of_range("Bloom::set_strength");
+		throw invalid_argument("Bloom::set_strength");
 	combine_shdata.uniform("strength", s);
 }
 
@@ -102,11 +106,10 @@ void Bloom::render(const Texture2D &src, const Texture2D &)
 	{
 		Bind bind_shader(blur_shader);
 		blur_shdata_common.apply();
-		Bind bind_fbo(fbo, true);
 		for(unsigned i=0; i<2; ++i)
 		{
+			Bind bind_fbo(fbo[i], true);
 			Bind bind_tex(i ? tex[0] : src);
-			fbo.attach(COLOR_ATTACHMENT0, tex[i], 0);
 			blur_shdata[i].apply();
 			quad.draw();
 		}