summaryrefslogtreecommitdiffstats
path: root/video/out/gl_video.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-03 16:52:44 +0100
committerwm4 <wm4@nowhere>2015-02-03 16:52:44 +0100
commitf296dcb248625d6e5979eae1e683b5f4522896f9 (patch)
tree955606d2a9d73f4dee1e1404053e446a45c038e7 /video/out/gl_video.c
parent0f560bbf8a9a10411be2688dba9363621da0437d (diff)
downloadmpv-f296dcb248625d6e5979eae1e683b5f4522896f9.tar.bz2
mpv-f296dcb248625d6e5979eae1e683b5f4522896f9.tar.xz
csputils, vo_opengl: remove per-component gamma
There was some code accounting for different gamma values for R/G/B. It's inherited from an old, undocumented MPlayer feature, which was at some point disabled for convenience by myself (meaning you couldn't actually set separate gamma because it was removed from the property interface - mp_csp_copy_equalizer_values() just set them to the same value). Get rid of these meaningless leftovers.
Diffstat (limited to 'video/out/gl_video.c')
-rw-r--r--video/out/gl_video.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index 5ad935bd70..f965a4abd9 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -567,10 +567,8 @@ static void update_uniforms(struct gl_video *p, GLuint program)
gl->Uniform1f(gl->GetUniformLocation(program, "sig_offset"), sig_offset);
float gamma = p->opts.gamma ? p->opts.gamma : 1.0;
- gl->Uniform3f(gl->GetUniformLocation(program, "inv_gamma"),
- 1.0 / (cparams.rgamma * gamma),
- 1.0 / (cparams.ggamma * gamma),
- 1.0 / (cparams.bgamma * gamma));
+ gl->Uniform1f(gl->GetUniformLocation(program, "inv_gamma"),
+ 1.0 / (cparams.gamma * gamma));
for (int n = 0; n < p->plane_count; n++) {
char textures_n[32];