X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.cpp;h=6f3121d8afa6e873012da7629aa68717a9827d4f;hp=7f8dda2de1d76a1a57ec54bf06b10191bec62805;hb=3fbc6a0e7ecc008b0bdafcbc576b79c24117859e;hpb=879854382e1f6db14812cd6bd5390ca01f4b1d5a

diff --git a/effect.cpp b/effect.cpp
index 7f8dda2..6f3121d 100644
--- a/effect.cpp
+++ b/effect.cpp
@@ -1,5 +1,3 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
@@ -7,8 +5,7 @@
 #include "effect_chain.h"
 #include "util.h"
 
-#include <GL/gl.h>
-#include <GL/glext.h>
+#include "opengl.h"
 
 GLint get_uniform_location(GLuint glsl_program_num, const std::string &prefix, const std::string &key)
 {
@@ -170,9 +167,9 @@ void Effect::invalidate_1d_texture(const std::string &key)
 	params_tex_1d[key].needs_update = true;
 }
 
-void Effect::add_self_to_effect_chain(EffectChain *chain, Effect *input)
+void Effect::add_self_to_effect_chain(EffectChain *chain, const std::vector<Effect *> &inputs)
 {
-	chain->add_effect_raw(this, input);
+	chain->add_effect_raw(this, inputs);
 }
 
 // Output convenience uniforms for each parameter.
@@ -211,7 +208,7 @@ std::string Effect::output_convenience_uniforms() const
 	return output;
 }
 
-void Effect::set_uniforms(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num)
+void Effect::set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num)
 {
 	for (std::map<std::string, float*>::const_iterator it = params_float.begin();
 	     it != params_float.end();
@@ -229,7 +226,7 @@ void Effect::set_uniforms(GLuint glsl_program_num, const std::string& prefix, un
 		set_uniform_vec3(glsl_program_num, prefix, it->first, it->second);
 	}
 
-	for (std::map<std::string, Texture1D>::const_iterator it = params_tex_1d.begin();
+	for (std::map<std::string, Texture1D>::iterator it = params_tex_1d.begin();
 	     it != params_tex_1d.end();
 	     ++it) {
 		glActiveTexture(GL_TEXTURE0 + *sampler_num);
@@ -240,9 +237,12 @@ void Effect::set_uniforms(GLuint glsl_program_num, const std::string& prefix, un
 		if (it->second.needs_update) {
 			glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE16F_ARB, it->second.size, 0, GL_LUMINANCE, GL_FLOAT, it->second.values);
 			check_error();
+			it->second.needs_update = false;
 		}
 
 		set_uniform_int(glsl_program_num, prefix, it->first, *sampler_num);
 		++*sampler_num;
 	}
 }
+
+void Effect::clear_gl_state() {}