Move pixel_format out of the ImageFormat struct, since it is only relevant for FlatInput.

[movit] / blur_effect.cpp

diff --git a/blur_effect.cpp b/blur_effect.cpp
index 285169851705309c0867b50bac0408c6284ca1a2..22e7d0ba781f40e4cd2ef385bb194005cf39fc70 100644 (file)
--- a/blur_effect.cpp
+++ b/blur_effect.cpp
@@ -1,12 +1,9 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <math.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
 #include <assert.h>
 
 #include "blur_effect.h"
 #include "util.h"
+#include "opengl.h"
 
 // Must match blur_effect.frag.
 #define NUM_TAPS 16
@@ -47,9 +44,9 @@ std::string SingleBlurPassEffect::output_fragment_shader()
        return read_file("blur_effect.frag");
 }
 
-void SingleBlurPassEffect::set_uniforms(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+void SingleBlurPassEffect::set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
 {
-       Effect::set_uniforms(glsl_program_num, prefix, sampler_num);
+       Effect::set_gl_state(glsl_program_num, prefix, sampler_num);
 
        int base_texture_size, texture_size;
        if (direction == HORIZONTAL) {
@@ -202,3 +199,13 @@ void SingleBlurPassEffect::set_uniforms(GLuint glsl_program_num, const std::stri
        set_uniform_vec4_array(glsl_program_num, prefix, "samples", samples, NUM_TAPS + 1);
 #endif
 }
+
+void SingleBlurPassEffect::clear_gl_state()
+{
+       glActiveTexture(GL_TEXTURE0);
+       check_error();
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
+       check_error();
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 1000);
+       check_error();
+}