From f0b15ad447927a794ee0785cd477348b10d875ae Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 24 Feb 2016 10:23:50 +0100 Subject: vo_opengl, vo_rpi: unbreak a few things Commit 2f562825 didn't remove the "color" declaration for these. Since the shader header already declares it, shader compilation broke. --- video/out/vo_rpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'video/out/vo_rpi.c') diff --git a/video/out/vo_rpi.c b/video/out/vo_rpi.c index a3f104a13f..9d782fc9c5 100644 --- a/video/out/vo_rpi.c +++ b/video/out/vo_rpi.c @@ -144,12 +144,12 @@ static void update_osd(struct vo *vo) switch (fmt) { case SUBBITMAP_RGBA: { GLSLF("// OSD (RGBA)\n"); - GLSL(vec4 color = texture(osdtex, texcoord).bgra;) + GLSL(color = texture(osdtex, texcoord).bgra;) break; } case SUBBITMAP_LIBASS: { GLSLF("// OSD (libass)\n"); - GLSL(vec4 color = + GLSL(color = vec4(ass_color.rgb, ass_color.a * texture(osdtex, texcoord).r);) break; } -- cgit v1.2.3