diff options
| author | wm4 <wm4@nowhere> | 2015-02-24 13:36:43 +0100 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-02-25 11:08:39 +0900 |
| commit | fd7077ade9d963b1f2823fed13e9e8e8ec341969 (patch) | |
| tree | a33899fce8f9fc90b885a30842bfd614f9196694 | |
| parent | d40ccc3416dc24ab7920492fc1f8e50b5f72d199 (diff) | |
| download | mpv-fd7077ade9d963b1f2823fed13e9e8e8ec341969.tar.bz2 mpv-fd7077ade9d963b1f2823fed13e9e8e8ec341969.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.)
(cherry picked from commit 2c8d16d89f6f64a587222dd53a3d27b2a218ee01)
| -rw-r--r-- | video/out/gl_video_shaders.glsl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/video/out/gl_video_shaders.glsl b/video/out/gl_video_shaders.glsl index f8aef48b9b..2f411677bd 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) \ @@ -328,6 +327,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 |