X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.cpp;h=6f3121d8afa6e873012da7629aa68717a9827d4f;hp=3128f0d657b74e851d18f506b94425a28cf6aa87;hb=3fbc6a0e7ecc008b0bdafcbc576b79c24117859e;hpb=f6acc0d1d488567e651220ffd327591c1443f49b diff --git a/effect.cpp b/effect.cpp index 3128f0d..6f3121d 100644 --- a/effect.cpp +++ b/effect.cpp @@ -1,5 +1,3 @@ -#define GL_GLEXT_PROTOTYPES 1 - #include #include #include @@ -7,8 +5,7 @@ #include "effect_chain.h" #include "util.h" -#include -#include +#include "opengl.h" GLint get_uniform_location(GLuint glsl_program_num, const std::string &prefix, const std::string &key) { @@ -229,7 +226,7 @@ void Effect::set_gl_state(GLuint glsl_program_num, const std::string& prefix, un set_uniform_vec3(glsl_program_num, prefix, it->first, it->second); } - for (std::map::const_iterator it = params_tex_1d.begin(); + for (std::map::iterator it = params_tex_1d.begin(); it != params_tex_1d.end(); ++it) { glActiveTexture(GL_TEXTURE0 + *sampler_num);