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
..
dec_video.c	vd_lavc: fix a small memory leak on init error	2014-09-29 20:37:12 +02:00
dec_video.h	video: don't keep multiple pointers to hwdec info struct	2014-08-11 23:09:39 +02:00
dxva2.c	win32: request UTF-16 API variants, Vista+ APIs, and COM C macros	2015-01-07 21:42:44 +01:00
gpu_memcpy_sse4.h	dxva2: gpu_memcpy: fix build for GCC 4.8.3	2014-10-26 13:56:41 +01:00
lavc.h	command: add property returning detected hwdec API	2015-02-02 22:43:13 +01:00
vaapi.c	video: un-discourage "vaapi-copy" hwdec mode	2015-02-20 22:24:37 +01:00
vd_lavc.c	Revert "Revert recent vo_opengl related commits"	2015-02-28 20:23:47 +01:00
vd.h	video: add a "hwdec" property to enable or disable hw decoding at runtime	2014-04-23 01:58:12 +02:00
vda.c	vda: only support the new hwaccel 1.2 API (remove old code)	2014-08-01 10:38:18 +02:00
vdpau.c	video: have a generic context struct for hwdec backends	2015-01-22 15:32:23 +01:00