summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-24 13:36:43 +0100
committerwm4 <wm4@nowhere>2015-02-24 13:36:43 +0100
commit2c8d16d89f6f64a587222dd53a3d27b2a218ee01 (patch)
tree9764afc03708440feb3505c4d5adb906a229e1b1
parenta92cab736f05e855dc52618a64ecc5b1b8d1eccd (diff)
downloadmpv-2c8d16d89f6f64a587222dd53a3d27b2a218ee01.tar.bz2
mpv-2c8d16d89f6f64a587222dd53a3d27b2a218ee01.tar.xz
vo_opengl: extend ifdef against shader arrays
GLES2 shaders do not have line continuation characters. Abuse the HAVE_ARRAYS define to exclude code which uses arrays, and which also happens to cover all code that defines multi-line macros. (So yes, this is a hack.)
-rw-r--r--video/out/gl_video_shaders.glsl3
1 files changed, 2 insertions, 1 deletions
diff --git a/video/out/gl_video_shaders.glsl b/video/out/gl_video_shaders.glsl
index b95953bfa6..965a8f725b 100644
--- a/video/out/gl_video_shaders.glsl
+++ b/video/out/gl_video_shaders.glsl
@@ -252,7 +252,6 @@ float[6] weights6(sampler2D lookup, float f) {
vec4 c2 = texture(lookup, vec2(0.75, f));
return float[6](c1.r, c1.g, c1.b, c2.r, c2.g, c2.b);
}
-#endif
// For N=n*4 with n>1.
#define WEIGHTS_N(NAME, N) \
@@ -333,6 +332,8 @@ float[6] weights6(sampler2D lookup, float f) {
return mix(res, clamp(res, lo, hi), ANTIRING); \
}
+#endif /* HAVE_ARRAYS */
+
#ifdef DEF_SCALER0
DEF_SCALER0
#endif