diff options
| author | wm4 <wm4@nowhere> | 2016-09-14 22:49:08 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-09-14 22:49:08 +0200 |
| commit | 30d147687f918942b97d63f5bff6527c4bff90a4 (patch) | |
| tree | 82a2b963850e632cfe29294e1dd7dcf826cb8ebe | |
| parent | 88a07c5f53812b4bb4959e6cfc8353180b6b5c91 (diff) | |
| download | mpv-30d147687f918942b97d63f5bff6527c4bff90a4.tar.bz2 mpv-30d147687f918942b97d63f5bff6527c4bff90a4.tar.xz | |
vo_opengl: fix OSD with icc-profile after previous commit
This happened to break because the texture unit wasn't reset to 0, which
some code expects. The OSD code in particular set the OSD texture on the
wrong texture unit, with the result that OSD/OSC was not visible.
| -rw-r--r-- | video/out/opengl/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/video/out/opengl/utils.c b/video/out/opengl/utils.c index c0bd07fb91..6c879fd535 100644 --- a/video/out/opengl/utils.c +++ b/video/out/opengl/utils.c @@ -1052,6 +1052,8 @@ void gl_sc_generate(struct gl_shader_cache *sc) for (int n = 0; n < sc->num_uniforms; n++) update_uniform(gl, entry, &sc->uniforms[n], n); + gl->ActiveTexture(GL_TEXTURE0); + sc->needs_reset = true; } |