X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.cpp;h=6362a095adb554dc6adf0e7978f7b3d678e7dfed;hp=e728963759a7f85c85c86f29e304a72c7d8f315b;hb=6eb839737216564bcaf4645b7ebf6ea9efc2da09;hpb=eb66e8ed648c485ae211e2ed179ca116b7fa65d7

diff --git a/effect_chain.cpp b/effect_chain.cpp
index e728963..6362a09 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -153,8 +153,8 @@ EffectChain::Phase EffectChain::compile_glsl_program(unsigned start_index, unsig
 		frag_shader += replace_prefix(effects[i]->output_fragment_shader(), effect_id);
 		frag_shader += "#undef PREFIX\n";
 		frag_shader += "#undef FUNCNAME\n";
-		frag_shader += "#undef LAST_INPUT\n";
-		frag_shader += std::string("#define LAST_INPUT ") + effect_id + "\n";
+		frag_shader += "#undef INPUT\n";
+		frag_shader += std::string("#define INPUT ") + effect_id + "\n";
 		frag_shader += "\n";
 
 		input_needs_mipmaps |= effects[i]->needs_mipmaps();
@@ -208,7 +208,7 @@ void EffectChain::finalize()
 	// and of course at the end.
 	unsigned start = 0;
 	for (unsigned i = 0; i < effects.size(); ++i) {
-		if (effects[i]->needs_many_samples() && i != start) {
+		if (effects[i]->needs_texture_bounce() && i != start) {
 			phases.push_back(compile_glsl_program(start, i));
 			start = i;
 		}