X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=effect.cpp;h=8cdf236a1cad3f07e2a0b2645f22e23066f297b7;hb=a93b0c94f68bf897adfdca95b292494497fa4f7f;hp=7f8dda2de1d76a1a57ec54bf06b10191bec62805;hpb=879854382e1f6db14812cd6bd5390ca01f4b1d5a;p=movit

diff --git a/effect.cpp b/effect.cpp
index 7f8dda2..8cdf236 100644
--- a/effect.cpp
+++ b/effect.cpp
@@ -170,9 +170,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 +211,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();
@@ -246,3 +246,5 @@ void Effect::set_uniforms(GLuint glsl_program_num, const std::string& prefix, un
 		++*sampler_num;
 	}
 }
+
+void Effect::clear_gl_state() {}