X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.cpp;h=3128f0d657b74e851d18f506b94425a28cf6aa87;hp=1aa37781525f1f7454f656e0c05161ddce9f82e1;hb=f6acc0d1d488567e651220ffd327591c1443f49b;hpb=5058b68995b5d39042df42df06d55559ee535d38 diff --git a/effect.cpp b/effect.cpp index 1aa3778..3128f0d 100644 --- a/effect.cpp +++ b/effect.cpp @@ -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::const_iterator it = params_float.begin(); it != params_float.end(); @@ -240,9 +240,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() {}