Merge branch 'master' into epoxy

[movit] / fft_pass_effect.frag

diff --git a/fft_pass_effect.frag b/fft_pass_effect.frag
index 462a6734c9ba87eae62f67aa2d09c5d264066718..607f86ab0149dab1d97e7aefeb77454b193e8fa9 100644 (file)
--- a/fft_pass_effect.frag
+++ b/fft_pass_effect.frag
@@ -2,15 +2,15 @@
 // and 0 otherwise.
 
 uniform float PREFIX(num_repeats);
-uniform sampler1D PREFIX(support_tex);
+uniform sampler2D PREFIX(support_tex);
 
 vec4 FUNCNAME(vec2 tc) {
 #if DIRECTION_VERTICAL
-       vec4 support = texture1D(PREFIX(support_tex), tc.y * PREFIX(num_repeats));
-        vec4 c1 = INPUT(vec2(tc.x, 1.0 - (tc.y + support.x)));
-        vec4 c2 = INPUT(vec2(tc.x, 1.0 - (tc.y + support.y)));
+       vec4 support = tex2D(PREFIX(support_tex), vec2(tc.y * PREFIX(num_repeats), 0.0));
+        vec4 c1 = INPUT(vec2(tc.x, tc.y + support.x));
+        vec4 c2 = INPUT(vec2(tc.x, tc.y + support.y));
 #else
-       vec4 support = texture1D(PREFIX(support_tex), tc.x * PREFIX(num_repeats));
+       vec4 support = tex2D(PREFIX(support_tex), vec2(tc.x * PREFIX(num_repeats), 0.0));
         vec4 c1 = INPUT(vec2(tc.x + support.x, tc.y));
         vec4 c2 = INPUT(vec2(tc.x + support.y, tc.y));
 #endif