Change to using GLEW everywhere.

[movit] / blur_effect.cpp

diff --git a/blur_effect.cpp b/blur_effect.cpp
index 579521fde00b2e952824681bf5dcaa1aea178e7e..77238533e308054ccdd60475313d86b2e573bbd8 100644 (file)
--- a/blur_effect.cpp
+++ b/blur_effect.cpp
@@ -1,10 +1,10 @@
 #include <math.h>
 #include <assert.h>
+#include <GL/glew.h>
 
 #include "blur_effect.h"
 #include "effect_chain.h"
 #include "util.h"
-#include "opengl.h"
 
 // Must match blur_effect.frag.
 #define NUM_TAPS 16
@@ -16,9 +16,9 @@ BlurEffect::BlurEffect()
 {
        // The first blur pass will forward resolution information to us.
        hpass = new SingleBlurPassEffect(this);
-       hpass->set_int("direction", SingleBlurPassEffect::HORIZONTAL);
+       CHECK(hpass->set_int("direction", SingleBlurPassEffect::HORIZONTAL));
        vpass = new SingleBlurPassEffect(NULL);
-       vpass->set_int("direction", SingleBlurPassEffect::VERTICAL);
+       CHECK(vpass->set_int("direction", SingleBlurPassEffect::VERTICAL));
 
        update_radius();
 }
@@ -162,13 +162,8 @@ void SingleBlurPassEffect::set_gl_state(GLuint glsl_program_num, const std::stri
                float w2 = weight[base_pos + 1];
 
                float offset, total_weight;
-               if (w1 + w2 < 1e-6) {
-                       offset = 0.5f;
-                       total_weight = 0.0f;
-               } else {
-                       offset = w2 / (w1 + w2);
-                       total_weight = w1 + w2;
-               }
+               combine_two_samples(w1, w2, &offset, &total_weight, NULL);
+
                float x = 0.0f, y = 0.0f;
 
                if (direction == HORIZONTAL) {