diff options
| author | wm4 <wm4@nowhere> | 2016-09-14 20:23:46 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-09-14 20:24:06 +0200 |
| commit | e24ba8fa7f1a0645307ab53e16d9d6d1fe2349b2 (patch) | |
| tree | 9c238905eecfae57e86b9c5423598aec4aa82a49 /video/out/opengl/utils.h | |
| parent | ffbc85cde94da81c9ba1db64451ec11400f98497 (diff) | |
| download | mpv-e24ba8fa7f1a0645307ab53e16d9d6d1fe2349b2.tar.bz2 mpv-e24ba8fa7f1a0645307ab53e16d9d6d1fe2349b2.tar.xz | |
vo_opengl: require explicit reset on shader cache after rendering
The caller now has to call gl_sc_reset(), and _after_ rendering. This
way we can unset OpenGL state that was setup for rendering. This affects
the shader program, for example. The next commit uses this to
automatically manage texture units via the shader cache.
vo_rpi.c changes untested.
Diffstat (limited to 'video/out/opengl/utils.h')
| -rw-r--r-- | video/out/opengl/utils.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/video/out/opengl/utils.h b/video/out/opengl/utils.h index d81599a71f..ab3c13c915 100644 --- a/video/out/opengl/utils.h +++ b/video/out/opengl/utils.h @@ -167,8 +167,9 @@ void gl_sc_uniform_mat3(struct gl_shader_cache *sc, char *name, bool transpose, GLfloat *v); void gl_sc_set_vao(struct gl_shader_cache *sc, struct gl_vao *vao); void gl_sc_enable_extension(struct gl_shader_cache *sc, char *name); -void gl_sc_gen_shader_and_reset(struct gl_shader_cache *sc); +void gl_sc_generate(struct gl_shader_cache *sc); void gl_sc_reset(struct gl_shader_cache *sc); +void gl_sc_unbind(struct gl_shader_cache *sc); struct gl_timer; |