From: Steinar H. Gunderson Date: Sun, 23 Mar 2014 01:35:22 +0000 (+0100) Subject: Merge branch 'master' X-Git-Tag: 1.1~18 X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=d01854ff8276207e5493c7c97a1e02cae81c64a0;hp=131e7179b596f8268fd80c32312849da83581e55 Merge branch 'master' --- diff --git a/blur_effect.frag b/blur_effect.frag index 8853854..afe9f2e 100644 --- a/blur_effect.frag +++ b/blur_effect.frag @@ -22,3 +22,5 @@ vec4 FUNCNAME(vec2 tc) { } return sum; } + +#undef DIRECTION_VERTICAL diff --git a/fft_pass_effect.frag b/fft_pass_effect.frag index edcf695..fcffba7 100644 --- a/fft_pass_effect.frag +++ b/fft_pass_effect.frag @@ -22,3 +22,5 @@ vec4 FUNCNAME(vec2 tc) { // where * is complex multiplication. return c1 + support.z * c2 + support.w * vec4(-c2.y, c2.x, -c2.w, c2.z); } + +#undef DIRECTION_VERTICAL diff --git a/slice_effect.frag b/slice_effect.frag index 59e3cc1..e77c9fa 100644 --- a/slice_effect.frag +++ b/slice_effect.frag @@ -25,3 +25,5 @@ vec4 FUNCNAME(vec2 tc) { return INPUT(vec2(input_coord, tc.y)); #endif } + +#undef DIRECTION_VERTICAL