RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity
mpv/video
History
Niklas Haas a76cc1dafc
Revert "Revert recent vo_opengl related commits" 
Omitted a simple, but devastasting check. Fixed the relevant commits
now.

This reverts commit 8d24e9d9b8.

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");
 		2015-02-28 20:23:47 +01:00
..
decode Revert "Revert recent vo_opengl related commits" 2015-02-28 20:23:47 +01:00
filter vf: fix indentation level of verbose output 2015-02-23 16:12:03 +01:00
out Revert "Revert recent vo_opengl related commits" 2015-02-28 20:23:47 +01:00
csputils.c Revert "Revert recent vo_opengl related commits" 2015-02-28 20:23:47 +01:00
csputils.h Revert "Revert recent vo_opengl related commits" 2015-02-28 20:23:47 +01:00
fmt-conversion.c video: work around libswscale for PNG pixel formats 2015-02-06 23:22:16 +01:00
fmt-conversion.h
…
hwdec.h command: add property returning detected hwdec API 2015-02-02 22:43:13 +01:00
image_writer.c Revert "Revert recent vo_opengl related commits" 2015-02-28 20:23:47 +01:00
image_writer.h Revert "Revert recent vo_opengl related commits" 2015-02-28 20:23:47 +01:00
img_format.c video: try to keep implied alpha when using conversion filters 2015-01-21 21:49:15 +01:00
img_format.h vo_opengl: handle grayscale input better, add YA16 support 2015-01-21 19:29:18 +01:00
img_fourcc.h
…
memcpy_pic.h
…
mp_image.c Revert "Revert recent vo_opengl related commits" 2015-02-28 20:23:47 +01:00
mp_image.h Revert "Revert recent vo_opengl related commits" 2015-02-28 20:23:47 +01:00
mp_image_pool.c mp_image_pool: allow passing pool=NULL in more places 2015-01-22 17:37:40 +01:00
mp_image_pool.h
…
sws_utils.c video: work around libswscale for PNG pixel formats 2015-02-06 23:22:16 +01:00
sws_utils.h video: work around libswscale for PNG pixel formats 2015-02-06 23:22:16 +01:00
vaapi.c command: add property returning detected hwdec API 2015-02-02 22:43:13 +01:00
vaapi.h video: have a generic context struct for hwdec backends 2015-01-22 15:32:23 +01:00
vdpau.c command: add property returning detected hwdec API 2015-02-02 22:43:13 +01:00
vdpau.h video: handle hwdec screenshots differently 2015-01-22 18:18:23 +01:00
vdpau_functions.inc video: handle hwdec screenshots differently 2015-01-22 18:18:23 +01:00
vdpau_mixer.c video: handle hwdec screenshots differently 2015-01-22 18:18:23 +01:00
vdpau_mixer.h
…