Disallow direct access to uniform array elements

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

diff --git a/source/bloom.cpp b/source/bloom.cpp
index fdd11703f6ceb565e20c91140df53cecda2fe8ba..a715749608d45247cc1660b73de37044f75b4795 100644 (file)
--- a/source/bloom.cpp
+++ b/source/bloom.cpp
@@ -59,6 +59,8 @@ Bloom::Bloom(unsigned w, unsigned h):
                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);
@@ -86,7 +88,7 @@ void Bloom::set_radius(float r)
        for(int i=0; i<=size*2; ++i)
                factors[i] /= sum;
 
-       blur_shdata_common.uniform1_array("factors[0]", size*2+1, &factors.front());
+       blur_shdata_common.uniform1_array("factors", size*2+1, &factors.front());
 }
 
 void Bloom::set_strength(float s)
@@ -98,17 +100,16 @@ void Bloom::set_strength(float s)
 
 void Bloom::render(const Texture2D &src, const Texture2D &)
 {
-       Bind unbind_dtest(static_cast<DepthTest *>(0), true);
-       Bind unbind_blend(static_cast<Blend *>(0), true);
+       BindRestore unbind_dtest(static_cast<DepthTest *>(0));
+       BindRestore unbind_blend(static_cast<Blend *>(0));
 
        {
                Bind bind_shader(blur_shader);
                blur_shdata_common.apply();
-               Bind bind_fbo(fbo, true);
                for(unsigned i=0; i<2; ++i)
                {
+                       BindRestore bind_fbo(fbo[i]);
                        Bind bind_tex(i ? tex[0] : src);
-                       fbo.attach(COLOR_ATTACHMENT0, tex[i], 0);
                        blur_shdata[i].apply();
                        quad.draw();
                }