Remove sandbox_effect from coverage.

[movit] / blur_effect.cpp

diff --git a/blur_effect.cpp b/blur_effect.cpp
index 80ccb3f2bee02769b90b487975b36ca83248ded6..80aef747c8a6bba0da40f20b0a06e91b810e2937 100644 (file)
--- a/blur_effect.cpp
+++ b/blur_effect.cpp
@@ -1,13 +1,17 @@
-#include <math.h>
+#include <GL/glew.h>
 #include <assert.h>
+#include <math.h>
+#include <algorithm>
 
 #include "blur_effect.h"
 #include "effect_chain.h"
+#include "effect_util.h"
 #include "util.h"
-#include "opengl.h"
 
 // Must match blur_effect.frag.
 #define NUM_TAPS 16
+
+using namespace std;
        
 BlurEffect::BlurEffect()
        : radius(3.0f),
@@ -54,8 +58,8 @@ void BlurEffect::update_radius()
        float adjusted_radius = radius;
        while ((mipmap_width > 1 || mipmap_height > 1) && adjusted_radius * 1.5f > NUM_TAPS / 2) {
                // Find the next mipmap size (round down, minimum 1 pixel).
-               mipmap_width = std::max(mipmap_width / 2, 1u);
-               mipmap_height = std::max(mipmap_height / 2, 1u);
+               mipmap_width = max(mipmap_width / 2, 1u);
+               mipmap_height = max(mipmap_height / 2, 1u);
 
                // Approximate when mipmap sizes are odd, but good enough.
                adjusted_radius = radius * float(mipmap_width) / float(input_width);
@@ -64,15 +68,19 @@ void BlurEffect::update_radius()
        bool ok = hpass->set_float("radius", adjusted_radius);
        ok |= hpass->set_int("width", mipmap_width);
        ok |= hpass->set_int("height", mipmap_height);
+       ok |= hpass->set_int("virtual_width", mipmap_width);
+       ok |= hpass->set_int("virtual_height", mipmap_height);
 
        ok |= vpass->set_float("radius", adjusted_radius);
        ok |= vpass->set_int("width", mipmap_width);
        ok |= vpass->set_int("height", mipmap_height);
+       ok |= vpass->set_int("virtual_width", input_width);
+       ok |= vpass->set_int("virtual_height", input_height);
 
        assert(ok);
 }
 
-bool BlurEffect::set_float(const std::string &key, float value) {
+bool BlurEffect::set_float(const string &key, float value) {
        if (key == "radius") {
                radius = value;
                update_radius();
@@ -92,14 +100,16 @@ SingleBlurPassEffect::SingleBlurPassEffect(BlurEffect *parent)
        register_int("direction", (int *)&direction);
        register_int("width", &width);
        register_int("height", &height);
+       register_int("virtual_width", &virtual_width);
+       register_int("virtual_height", &virtual_height);
 }
 
-std::string SingleBlurPassEffect::output_fragment_shader()
+string SingleBlurPassEffect::output_fragment_shader()
 {
        return read_file("blur_effect.frag");
 }
 
-void SingleBlurPassEffect::set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+void SingleBlurPassEffect::set_gl_state(GLuint glsl_program_num, const string &prefix, unsigned *sampler_num)
 {
        Effect::set_gl_state(glsl_program_num, prefix, sampler_num);