Make the blur use the resize functionality, which also unbreaks the in-between sampli...

[movit] / sandbox_effect.cpp

diff --git a/sandbox_effect.cpp b/sandbox_effect.cpp
index 85fa9001589a7356855acfcfdbc3d3fcadecd870..561048d416fd0241af4e4bac1c9edc34e9a4c1e3 100644 (file)
--- a/sandbox_effect.cpp
+++ b/sandbox_effect.cpp
@@ -1,12 +1,9 @@
-#define GL_GLEXT_PROTOTYPES 1
-

 #include <math.h>
 #include <math.h>

-#include <GL/gl.h>
-#include <GL/glext.h>

 #include <assert.h>
 
 #include "sandbox_effect.h"
 #include "util.h"
 #include <assert.h>
 
 #include "sandbox_effect.h"
 #include "util.h"

+#include "opengl.h"

 
 SandboxEffect::SandboxEffect()
        : parm(0.0f)
 
 SandboxEffect::SandboxEffect()
        : parm(0.0f)


@@ -19,9 +16,9 @@ std::string SandboxEffect::output_fragment_shader()
        return read_file("sandbox_effect.frag");
 }
 
        return read_file("sandbox_effect.frag");
 }
 

-void SandboxEffect::set_uniforms(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+void SandboxEffect::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);

 
        // Any OpenGL state you might want to set, goes here.
 }
 
        // Any OpenGL state you might want to set, goes here.
 }