X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=blur_effect.cpp;h=77238533e308054ccdd60475313d86b2e573bbd8;hp=90d1b68653b9af51c009c1fae48a7e007998da8d;hb=7221906173f1cf1ce6913cbe9d62d5ca11e9ee0d;hpb=b09a4cb8dec09bcd1e42026d5b229b57e620e47c diff --git a/blur_effect.cpp b/blur_effect.cpp index 90d1b68..7723853 100644 --- a/blur_effect.cpp +++ b/blur_effect.cpp @@ -1,10 +1,10 @@ #include #include +#include #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,7 +162,7 @@ void SingleBlurPassEffect::set_gl_state(GLuint glsl_program_num, const std::stri float w2 = weight[base_pos + 1]; float offset, total_weight; - combine_two_samples(w1, w2, &offset, &total_weight); + combine_two_samples(w1, w2, &offset, &total_weight, NULL); float x = 0.0f, y = 0.0f;