Merge GPU blur/transition/generate effects into M12.7

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

crates/effects/src/blur2.rs

@@ -277,11 +277,9 @@ fn iris_spans(r: f64, sides: u32, rotation_deg: f64, roundness: f64) -> Vec<(i64
     spans
 }
 
-fn camera_lens_blur(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let r = ctx.params.f("blurRadius").max(0.0) * b.scale;
-    if r < 0.5 {
-        return b;
-    }
+/// Camera Lens Blur's iris spans at blur radius `r` pixels (shape, rotation, roundness and
+/// aspect ratio applied) and the iris' horizontal reach (shared with the GPU kernel).
+pub fn camera_lens_spans(ctx: &EffectCtx, r: f64) -> (Vec<(i64, i64, i64)>, f64) {
     let shape = ctx.params.e("irisProperties/irisShape");
     let sides = if shape >= 8 { 0 } else { shape + 3 };
     let mut spans = iris_spans(r, sides, ctx.params.f("irisProperties/irisRotation"), ctx.params.f("irisProperties/irisRoundness").clamp(0.0, 100.0) / 100.0);
@@ -293,7 +291,15 @@ fn camera_lens_blur(ctx: &EffectCtx, mut b: Buf) -> Buf {
             s.2 = (s.2 as f64 * aspect).round() as i64;
         }
     }
-    let reach = r * aspect.max(1.0);
+    (spans, r * aspect.max(1.0))
+}
+
+fn camera_lens_blur(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    let r = ctx.params.f("blurRadius").max(0.0) * b.scale;
+    if r < 0.5 {
+        return b;
+    }
+    let (spans, reach) = camera_lens_spans(ctx, r);
     let repeat = ctx.params.b("repeatEdge") || ctx.adjustment;
     if !repeat {
         b.pad(reach.ceil() as u32 + 1);

crates/effects/src/generate.rs

@@ -75,7 +75,7 @@ pub(crate) const GEN_BLEND_MODES: [&str; 20] = [
     "Silhouette Alpha",
 ];
 
-fn gen_mode(i: u32) -> Option<BlendMode> {
+pub fn gen_mode(i: u32) -> Option<BlendMode> {
     Some(match i {
         0 => return None,
         2 => BlendMode::Add,

crates/effects/src/generate2.rs

@@ -61,7 +61,7 @@ const CELL_PATTERNS: [&str; 12] = [
 ];
 
 /// Shaping used for Cell Pattern option `i` (see [`cell_value`]).
-fn pattern_kind(i: u32) -> u32 {
+pub fn pattern_kind(i: u32) -> u32 {
     match i {
         0..=5 => i,
         6 => 1,

crates/effects/src/lib.rs

@@ -71,6 +71,12 @@ pub use effectcraft_raster::{AuxChannels, Image};
 pub use misc::{INVERT_ALPHA, INVERT_CHANNELS};
 pub use sim::particle_state;
 pub use sim3::playground_state;
+// CPU helpers the GPU kernels share (effectcraft-gpu).
+pub use blur2::camera_lens_spans;
+pub use generate::gen_mode;
+pub use generate2::pattern_kind as cell_pattern_kind;
+pub use noise::GrainLook;
+pub use transition::place_layer;
 
 /// Effect categories in Effects & Presets order.
 pub const CATEGORIES: &[&str] = &[
@@ -661,6 +667,20 @@ pub const GPU_EFFECTS: &[&str] = &[
     "ec.stylize.mosaic",
     "ec.stylize.findedges",
     "ec.stylize.emboss",
+    // Blur, transition and generate family (effectcraft-gpu `fx_generate`).
+    "ec.blur.radial",
+    "ec.blur.cameralens",
+    "ec.blur.ccradialfast",
+    "ec.transition.venetian",
+    "ec.transition.linearwipe",
+    "ec.transition.radialwipe",
+    "ec.transition.gradientwipe",
+    "ec.generate.cellpattern",
+    "ec.generate.checkerboard",
+    "ec.generate.grid",
+    "ec.generate.fourcolor",
+    "ec.noise.noise",
+    "ec.noise.addgrain",
 ];
 
 /// Effects whose output depends on [`EffectCtx::time`] directly (not only through animated

crates/effects/src/noise.rs

@@ -41,7 +41,7 @@ pub(crate) const GRAIN_BLEND_MODES: [&str; 5] = ["Film", "Multiply", "Add", "Scr
 
 /// The Tweaking / Color / Application / Animation controls Add Grain and Match Grain share
 /// (twirl-down groups with the same ids in both effects).
-pub(crate) struct GrainLook {
+pub struct GrainLook {
     pub intensity: f32,
     pub channel_intensity: [f32; 3],
     pub size: f32,
@@ -62,7 +62,7 @@ pub(crate) struct GrainLook {
 }
 
 impl GrainLook {
-    pub(crate) fn from_params(ctx: &EffectCtx) -> GrainLook {
+    pub fn from_params(ctx: &EffectCtx) -> GrainLook {
         let pr = ctx.params;
         let ch = |pre: &str, a: &str, b: &str, c: &str| [a, b, c].map(|k| pr.get(&format!("{pre}{k}")).map(Value::as_f64).unwrap_or(1.0) as f32);
         let ft = ctx.time * 24.0 * pr.f("animation/animationSpeed");

crates/effects/src/transition.rs

@@ -30,7 +30,7 @@ fn scale_px(px: &mut Px, k: f32) {
 /// Resample `other` into `b`'s pixel grid with placement `mode` (Gradient Wipe's Gradient
 /// Placement, Texturize's Texture Placement): 0 tile from the top-left, 1 centre once,
 /// 2 stretch to fit.
-pub(crate) fn place_layer(ctx: &EffectCtx, b: &Buf, other: &crate::LayerPixels, mode: u32) -> effectcraft_raster::Image {
+pub fn place_layer(ctx: &EffectCtx, b: &Buf, other: &crate::LayerPixels, mode: u32) -> effectcraft_raster::Image {
     let (ls, os) = (ctx.layer_size, other.size);
     let inv = 1.0 / b.scale.max(1e-9);
     crate::util::gen_image(b.img.width, b.img.height, |x, y| {