summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-16 21:00:03 +0100
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-02-19 13:24:31 +0900
commit8c992458c3ac0e4ab9ccded38be503df708ef27b (patch)
treeeb4091915418932d49b355d8162c98495e774e44
parent40149c017cfef3f86acda2dad70c439d22a84eba (diff)
downloadmpv-8c992458c3ac0e4ab9ccded38be503df708ef27b.tar.bz2
mpv-8c992458c3ac0e4ab9ccded38be503df708ef27b.tar.xz
vo_opengl: glsl: remove trailing \
This should be no problem... but it _might_ help with #1536, so it's worth a try. (cherry picked from commit 0063d94927a0dfd1ba8f4af1bc59467ba793ef82)
-rw-r--r--video/out/gl_video_shaders.glsl4
1 files changed, 2 insertions, 2 deletions
diff --git a/video/out/gl_video_shaders.glsl b/video/out/gl_video_shaders.glsl
index 636828c0ca..f8aef48b9b 100644
--- a/video/out/gl_video_shaders.glsl
+++ b/video/out/gl_video_shaders.glsl
@@ -305,12 +305,12 @@ float[6] weights6(sampler2D lookup, float f) {
w = texture1D(LUT, length(vec2(X, Y) - fcoord)/R).r; \
c = texture(tex, base + pt * vec2(X, Y)); \
wsum += w; \
- res += vec4(w) * c; \
+ res += vec4(w) * c;
#define SAMPLE_POLAR_PRIMARY(LUT, R, X, Y) \
SAMPLE_POLAR_HELPER(LUT, R, X, Y) \
lo = min(lo, c); \
- hi = max(hi, c); \
+ hi = max(hi, c);
#define SAMPLE_CONVOLUTION_POLAR_R(NAME, R, LUT, WEIGHTS_FN, ANTIRING) \
vec4 NAME(VIDEO_SAMPLER tex, vec2 texsize, vec2 texcoord) { \