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
..
cocoa	input: add MOUSE_ENTER keybinding.	2015-02-18 00:03:16 +01:00
wayland	…
aspect.c	…
aspect.h	…
bitmap_packer.c	…
bitmap_packer.h	…
cocoa_common.h	…
cocoa_common.m	cocoa: remove the setNextKeyView hack	2015-02-28 14:55:32 +01:00
d3d_shader_yuv.h	…
d3d_shader_yuv.hlsl	…
dither.c	…
dither.h	…
filter_kernels.c	filter_kernels: rename bilinear_slow to triangle	2015-02-24 03:13:37 +01:00
filter_kernels.h	…
gl_cocoa.c	…
gl_common.c	vo_opengl: minor robustness improvement in function loader	2015-02-20 18:53:35 +01:00
gl_common.h	vo_opengl: remove some unused functions	2015-01-28 19:40:52 +01:00
gl_header_fixes.h	…
gl_hwdec.c	…
gl_hwdec.h	vo_opengl: let hwdec driver report the exact image format	2015-01-29 19:53:49 +01:00
gl_hwdec_vaglx.c	vo_opengl: let hwdec driver report the exact image format	2015-01-29 19:53:49 +01:00
gl_hwdec_vda.c	command: add property returning detected hwdec API	2015-02-02 22:43:13 +01:00
gl_hwdec_vdpau.c	vo_opengl: let hwdec driver report the exact image format	2015-01-29 19:53:49 +01:00
gl_lcms.c	…
gl_lcms.h	…
gl_osd.c	vo_opengl: use triangle strip for video	2015-01-30 15:57:40 +01:00
gl_osd.h	vo_opengl: move remaining OSD rendering parts to gl_osd.c	2015-01-29 18:29:28 +01:00
gl_utils.c	vo_opengl: fix a cast	2015-01-29 21:13:06 +01:00
gl_utils.h	vo_opengl: split out a helper for drawing primitives	2015-01-29 17:19:01 +01:00
gl_video.c	Revert "Revert recent vo_opengl related commits"	2015-02-28 20:23:47 +01:00
gl_video.h	vo_opengl: add support for linear scaling without CMS	2015-02-06 03:37:21 +01:00
gl_video_shaders.glsl	vo_opengl: implement antiringing for tensor scalers	2015-02-27 04:35:15 +01:00
gl_w32.c	…
gl_wayland.c	…
gl_x11.c	…
gl_x11egl.c	x11egl: minor cleanup	2015-02-20 19:54:33 +01:00
vo.c	vo_opengl: fix smoothmotion coefficient calculation	2015-02-13 20:39:53 +01:00
vo.h	vo_opengl: fix smoothmotion coefficient calculation	2015-02-13 20:39:53 +01:00
vo_caca.c	…
vo_direct3d.c	…
vo_image.c	…
vo_lavc.c	…
vo_null.c	…
vo_opengl.c	vo_opengl: redraw when pausing while showing an interpolated frame	2015-02-04 23:37:38 +01:00
vo_opengl_cb.c	command: add property returning detected hwdec API	2015-02-02 22:43:13 +01:00
vo_sdl.c	…
vo_vaapi.c	…
vo_vdpau.c	vo_vdpau: minor simplification	2015-02-07 21:14:12 +01:00
vo_wayland.c	…
vo_x11.c	…
vo_xv.c	vo_xv: don't attempt to clear window before mapped	2015-02-26 09:26:28 +01:00
w32_common.c	input: add MOUSE_ENTER keybinding.	2015-02-18 00:03:16 +01:00
w32_common.h	…
wayland_common.c	input: add MOUSE_ENTER keybinding.	2015-02-18 00:03:16 +01:00
wayland_common.h	…
win_state.c	…
win_state.h	…
x11_common.c	input: add MOUSE_ENTER keybinding.	2015-02-18 00:03:16 +01:00
x11_common.h	vo_opengl, x11: implement icc-profile-auto	2015-01-26 02:18:47 +01:00
x11_icon.bin	…