Revert "Revert recent vo_opengl related commits"

Omitted a simple, but devastasting check. Fixed the relevant commits
now.

This reverts commit 8d24e9d9b8ad1b5d82139980eca148dc0f4a1eab.

diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index 9c8a643..f1ea03e 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -1034,9 +1034,9 @@ static void compile_shaders(struct gl_video *p)
     shader_def_opt(&header_conv, "USE_CONV_GAMMA", use_conv_gamma);
     shader_def_opt(&header_conv, "USE_CONST_LUMA", use_const_luma);
     shader_def_opt(&header_conv, "USE_LINEAR_LIGHT_BT1886",
-                   gamma_fun == MP_CSP_TRC_BT_1886);
+                   use_linear_light && gamma_fun == MP_CSP_TRC_BT_1886);
     shader_def_opt(&header_conv, "USE_LINEAR_LIGHT_SRGB",
-                   gamma_fun == MP_CSP_TRC_SRGB);
+                   use_linear_light && gamma_fun == MP_CSP_TRC_SRGB);
     shader_def_opt(&header_conv, "USE_SIGMOID", use_sigmoid);
     if (p->opts.alpha_mode > 0 && p->has_alpha && p->plane_count > 3)
         shader_def(&header_conv, "USE_ALPHA_PLANE", "3");

1 files changed, 6 insertions, 0 deletions

diff --git a/old-configure b/old-configure
index 2558985b03..6bdfc4413b 100755
--- a/old-configure
+++ b/old-configure
@@ -814,6 +814,12 @@ api_statement_check \
     'av_frame_get_metadata(NULL)'
 
 api_statement_check \
+    "libavutil AVFrame colorspace information" \
+    HAVE_AVFRAME_CSP \
+    libavutil/frame.h \
+    'AVFrame frame; frame.color_primaries = frame.color_trc = 0;'
+
+api_statement_check \
     "libavutil AVFrame skip samples metadata" \
     HAVE_AVFRAME_SKIP_SAMPLES \
     libavutil/frame.h \