RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-01 23:00:41 +00:00
Code Issues Releases Wiki Activity

vo_opengl, vo_rpi: unbreak a few things

Browse Source 
Commit 2f562825 didn't remove the "color" declaration for these. Since
the shader header already declares it, shader compilation broke.
This commit is contained in:
wm4 2016-02-24 10:23:50 +01:00
parent 441b605de2
commit f0b15ad447
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
video/out/opengl/nnedi3.c
View File

@ -226,7 +226,7 @@ void pass_nnedi3(GL *gl, struct gl_shader_cache *sc, int planes, int tex_num,
GLSLHF("}\n"); // nnedi3 GLSLHF("}\n"); // nnedi3
GLSL(vec4 color = vec4(1.0);) GLSL(color = vec4(1.0);)
for (int i = 0; i < planes; i++) { for (int i = 0; i < planes; i++) {
GLSLF("color[%d] = nnedi3(texture%d, texcoord%d, texture_size%d, %d, %f);\n", GLSLF("color[%d] = nnedi3(texture%d, texcoord%d, texture_size%d, %d, %f);\n",

2
video/out/opengl/superxbr.c
View File

@ -220,7 +220,7 @@ void pass_superxbr(struct gl_shader_cache *sc, int planes, int tex_num,
GLSLHF("}"); // superxbr() GLSLHF("}"); // superxbr()
GLSL(vec4 color = vec4(1.0);) GLSL(color = vec4(1.0);)
for (int i = 0; i < planes; i++) { for (int i = 0; i < planes; i++) {
GLSLF("color[%d] = superxbr(texture%d, texcoord%d, texture_size%d, %d, %f);\n", GLSLF("color[%d] = superxbr(texture%d, texcoord%d, texture_size%d, %d, %f);\n",

4
video/out/vo_rpi.c
View File

@ -144,12 +144,12 @@ static void update_osd(struct vo *vo)
switch (fmt) { switch (fmt) {
case SUBBITMAP_RGBA: { case SUBBITMAP_RGBA: {
GLSLF("// OSD (RGBA)\n"); GLSLF("// OSD (RGBA)\n");
GLSL(vec4 color = texture(osdtex, texcoord).bgra;) GLSL(color = texture(osdtex, texcoord).bgra;)
break; break;
} }
case SUBBITMAP_LIBASS: { case SUBBITMAP_LIBASS: {
GLSLF("// OSD (libass)\n"); GLSLF("// OSD (libass)\n");
GLSL(vec4 color = GLSL(color =
vec4(ass_color.rgb, ass_color.a * texture(osdtex, texcoord).r);) vec4(ass_color.rgb, ass_color.a * texture(osdtex, texcoord).r);)
break; break;
} }