Copy ProgramData::uniform_slots in copy constructor and operator=

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

diff --git a/source/bloom.cpp b/source/bloom.cpp
index ad7ec26943c4230a97ec0a5f0b30750f7680a22f..a715749608d45247cc1660b73de37044f75b4795 100644 (file)
--- a/source/bloom.cpp
+++ b/source/bloom.cpp
@@ -88,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)
@@ -100,15 +100,15 @@ 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();
                for(unsigned i=0; i<2; ++i)
                {
-                       Bind bind_fbo(fbo[i], true);
+                       BindRestore bind_fbo(fbo[i]);
                        Bind bind_tex(i ? tex[0] : src);
                        blur_shdata[i].apply();
                        quad.draw();