Release Movit 1.3.2. (From a branch, since I do not want to break ABI compatibility...

[movit] / slice_effect.frag

diff --git a/slice_effect.frag b/slice_effect.frag
index 59e3cc10de2c474f90a8ff25b54d10815c180c06..c6b36190b333dbefa81bc9705eec29318ff8ad13 100644 (file)
--- a/slice_effect.frag
+++ b/slice_effect.frag
@@ -1,7 +1,8 @@
-uniform float PREFIX(output_coord_to_slice_num);
-uniform float PREFIX(slice_num_to_input_coord);
-uniform float PREFIX(slice_offset_to_input_coord);
-uniform float PREFIX(offset);
+// Implicit uniforms:
+// uniform float PREFIX(output_coord_to_slice_num);
+// uniform float PREFIX(slice_num_to_input_coord);
+// uniform float PREFIX(slice_offset_to_input_coord);
+// uniform float PREFIX(normalized_offset);
  
 vec4 FUNCNAME(vec2 tc) {
        // DIRECTION_VERTICAL will be #defined to 1 if we are expanding vertically,
@@ -17,7 +18,7 @@ vec4 FUNCNAME(vec2 tc) {
        float slice_offset = fract(sliced_coord * PREFIX(output_coord_to_slice_num));
 
        // Find out where this slice begins in the input data, and then offset from that.
-       float input_coord = slice_num * PREFIX(slice_num_to_input_coord) + slice_offset * PREFIX(slice_offset_to_input_coord) + PREFIX(offset);
+       float input_coord = slice_num * PREFIX(slice_num_to_input_coord) + slice_offset * PREFIX(slice_offset_to_input_coord) + PREFIX(normalized_offset);
 
 #if DIRECTION_VERTICAL
        return INPUT(vec2(tc.x, 1.0 - input_coord));
@@ -25,3 +26,5 @@ vec4 FUNCNAME(vec2 tc) {
        return INPUT(vec2(input_coord, tc.y));
 #endif
 }
+
+#undef DIRECTION_VERTICAL