Use uniform arrays in Bloom and AnimatedObject

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

diff --git a/source/bloom.cpp b/source/bloom.cpp
index 896147c2e885074620866da9e9e8dacb836ad1a6..8a6ddbcd73b9ebda371518ded5a4a96502c5d5e8 100644 (file)
--- a/source/bloom.cpp
+++ b/source/bloom.cpp
@@ -82,9 +82,10 @@ 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)