X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=effect_chain.cpp;h=b6b5f59925df18b83ea75100e276e6d153076310;hb=236a0ad8b604d5b3bff53f40b600991168f76800;hp=751a6be2d361839c754ab8aeec4bc6c3f049cae3;hpb=6bec5fc3abc5f57c6cddec2148626cca9a94bedf;p=movit diff --git a/effect_chain.cpp b/effect_chain.cpp index 751a6be..b6b5f59 100644 --- a/effect_chain.cpp +++ b/effect_chain.cpp @@ -391,7 +391,7 @@ void EffectChain::compile_glsl_program(Phase *phase) frag_shader_header += "#define YCBCR_ALSO_OUTPUT_RGBA 1\n"; } } - frag_shader.append(read_version_dependent_file("footer", "frag")); + frag_shader.append(read_file("footer.frag")); // Collect uniforms from all effects and output them. Note that this needs // to happen after output_fragment_shader(), even though the uniforms come @@ -1646,6 +1646,10 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height { assert(finalized); + // This needs to be set anew, in case we are coming from a different context + // from when we initialized. + glDisable(GL_DITHER); + // Save original viewport. GLuint x = 0, y = 0;