summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-01-04 16:27:57 +0100
committerwm4 <wm4@nowhere>2016-01-04 16:34:16 +0100
commitc725f39baef33c15f10d3fbc4b68569c7115131a (patch)
tree4f034507e6f2f3e2f4db59d21448aefd2c54fc31 /video
parent1f38c2107d793f28139c3de1c318bfe38e087275 (diff)
downloadmpv-c725f39baef33c15f10d3fbc4b68569c7115131a.tar.bz2
mpv-c725f39baef33c15f10d3fbc4b68569c7115131a.tar.xz
vo_opengl: fix operation on GLES 2.0
GLSL in GLES 2.0 did not have line continuation in its preprocessor. This broke shader compilation. It also broke subtitle rendering in vo_rpi, which reuses some of the OpenGL code. Line continuation was finally added in GLES 3.0, which is perhaps the reason why ANGLE accepted it.
Diffstat (limited to 'video')
-rw-r--r--video/out/opengl/utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/video/out/opengl/utils.c b/video/out/opengl/utils.c
index c168cc60eb..0c7e3608a6 100644
--- a/video/out/opengl/utils.c
+++ b/video/out/opengl/utils.c
@@ -962,8 +962,8 @@ void gl_sc_gen_shader_and_reset(struct gl_shader_cache *sc)
}
// Additional helpers.
- ADD(frag, "#define LUT_POS(x, lut_size) \\\n");
- ADD(frag, " mix(0.5 / (lut_size), 1.0 - 0.5 / (lut_size), (x))\n");
+ ADD(frag, "#define LUT_POS(x, lut_size)"
+ " mix(0.5 / (lut_size), 1.0 - 0.5 / (lut_size), (x))\n");
// custom shader header
if (sc->header_text[0]) {