Verify framebuffer completeness in effect constructors

[libs/gl.git] / source / bloom.cpp

diff --git a/source/bloom.cpp b/source/bloom.cpp
index b73ea16079622cf34013ff88739be77c94b4852b..ad7ec26943c4230a97ec0a5f0b30750f7680a22f 100644 (file)
--- a/source/bloom.cpp
+++ b/source/bloom.cpp
@@ -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);
@@ -91,7 +94,7 @@ void Bloom::set_radius(float r)
 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);
 }
 
@@ -103,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();
                }