vo_gl: remove support for nvidia register combiners (yuv=1)

The register combiner color conversion is broken and seems to use a
slightly incorrect color matrix (the image looks gray-ish). Completely
remove all code related to nVidia register combiners.

Unless you have an ancient nVidia GPU, there's no reason to prefer register
combiners over fragment shaders. Users with ancient GPUs without fragment
shader support can just use -vo xv.

Passing yuv=1 (register combiners) as sub option will print a warning and
use yuv=2 (fragment shaders) instead.

1 files changed, 6 insertions, 1 deletions

diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 37d9727486..1ab5af6ac3 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -1264,7 +1264,7 @@ static int preinit_internal(struct vo *vo, const char *arg, int allow_sw,
                "    also try to use the GL_MESA_ycbcr_texture extension\n"
                "  yuv=<n>\n"
                "    0: use software YUV to RGB conversion.\n"
-               "    1: use register combiners (nVidia only, for older cards).\n"
+               "    1: deprecated, will use yuv=2 (used to be nVidia register combiners).\n"
                "    2: use fragment program.\n"
                "    3: use fragment program with gamma correction.\n"
                "    4: use fragment program with gamma correction via lookup.\n"
@@ -1312,6 +1312,11 @@ static int preinit_internal(struct vo *vo, const char *arg, int allow_sw,
                "removed. Use --noaspect instead.\n");
         return -1;
     }
+    if (p->use_yuv == 1) {
+        mp_msg(MSGT_VO, MSGL_WARN, "[gl] yuv=1 (nVidia register combiners) have"
+               " been removed, using yuv=2 instead.\n");
+        p->use_yuv = 2;
+    }
     p->glctx = init_mpglcontext(gltype, vo);
     if (!p->glctx)
         goto err_out;