Rename set_uniforms() to set_gl_state(), and make a corresponding clear_gl_state().

[movit] / effect_chain.cpp

diff --git a/effect_chain.cpp b/effect_chain.cpp
index bfb30bfc152e2189a80d1b4fabdbc6d18056f507..2144bfd705526440b8aba2b44c7c00b6b24f8f36 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -573,7 +573,7 @@ void EffectChain::render_to_screen(unsigned char *src)
                unsigned sampler_num = phases[phase].inputs.size();
                for (unsigned i = 0; i < phases[phase].effects.size(); ++i) {
                        Effect *effect = phases[phase].effects[i];
-                       effect->set_uniforms(phases[phase].glsl_program_num, effect_ids[effect], &sampler_num);
+                       effect->set_gl_state(phases[phase].glsl_program_num, effect_ids[effect], &sampler_num);
                }
 
                // Now draw!
@@ -594,11 +594,9 @@ void EffectChain::render_to_screen(unsigned char *src)
                glEnd();
                check_error();
 
-               // HACK
-               glActiveTexture(GL_TEXTURE0);
-               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
-               check_error();
-               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 1000);
-               check_error();
+               for (unsigned i = 0; i < phases[phase].effects.size(); ++i) {
+                       Effect *effect = phases[phase].effects[i];
+                       effect->clear_gl_state();
+               }
        }
 }