The truly free, open-source, local-first, cross-platform CapCut replacement. Scriptable through a JSON-RPC API & MCP.
Rust ffmpegfree-video-editormodel-context-protocolnon-linear-editoroffline-firstopen-source-video-editorself-hostedvideo-editingvideo-editing-automationvideo-editing-softwarevideo-editing-toolsvideo-editorvoice-cloningyoutube-automationyoutube-shorts
fix(effects): effects and transitions draw on OpenGL ES, whose uniforms come in whole 16 bytes
Jareerd3c2dcded65e
diff --git a/src/crates/concat-effects/src/shader.rs b/src/crates/concat-effects/src/shader.rsindex 07bd5d13..30b19709 100644--- a/src/crates/concat-effects/src/shader.rs+++ b/src/crates/concat-effects/src/shader.rs@@ -54,8 +54,11 @@ use crate::manifest::{MAX_CURVE_POINTS, MAX_SHRINK, Manifest, Param, ParamType,/// and a title's reveal map at group 3.const EFFECT_HEAD: &str = r#"// ── the host's half of the contract; see concat-effects/src/shader.rs ──struct Frame {- /// The layer's size in pixels.- size: vec2<f32>,+ /// The layer's size in pixels. Aligned to 16 so the block is 32 bytes:+ /// OpenGL ES binds uniforms in whole 16s, and wgpu refuses a pipeline+ /// whose uniform is not, so every effect failed on a phone with no+ /// Vulkan. The offsets are unchanged.+ @align(16) size: vec2<f32>,/// Seconds into the timeline.time: f32,/// How much of the effect to keep over the untouched layer.@@ -1438,6 +1441,36 @@ impl Entry {}}+/// Aligns `struct Params`' first field to 16, which makes the struct a+/// whole number of 16 bytes without moving a field: OpenGL ES binds+/// uniforms in whole 16s, and wgpu refused a one-knob effect's 4-byte+/// `Params` there, so every effect and transition failed on a phone with+/// no Vulkan. The buffer behind it is already padded to 16 (`stitch`'s+/// span). A field the package aligned itself is left as it is.+fn align_params(source: &mut String) {+ let Some(open) = source.match_indices("struct").find_map(|(at, _)| {+ // A declaration starts its line; a comment that names it does not.+ let line = &source[source[..at].rfind('\n').map_or(0, |n| n + 1)..at];+ if !line.trim().is_empty() {+ return None;+ }+ let rest = &source[at + "struct".len()..];+ let name = rest.trim_start();+ let after = name.strip_prefix("Params")?;+ if !after.starts_with(|c: char| c.is_whitespace() || c == '{') {+ return None;+ }+ Some(source.len() - after.len() + after.find('{')?)+ }) else {+ return;+ };+ let first = &source[open + 1..];+ let field = &first[..first.find(':').unwrap_or(first.len())];+ if !field.contains("@align") {+ source.insert_str(open + 1, " @align(16)");+ }+}+/// Stitches a package `body` into the host's contract for `entry`, in the/// edition its manifest's format asks for, parses and validates the result/// with naga, and reads its `Params` struct for where each declared@@ -1486,6 +1519,7 @@ fn stitch(source.push_str(body);source.push('\n');source.push_str(&host);+ align_params(&mut source);let module =naga::front::wgsl::parse_str(&source).map_err(|error| error.emit_to_string(&source))?;diff --git a/src/crates/concat-render/src/gpu.rs b/src/crates/concat-render/src/gpu.rsindex d8e9cd18..3f233c0c 100644--- a/src/crates/concat-render/src/gpu.rs+++ b/src/crates/concat-render/src/gpu.rs@@ -2560,8 +2560,9 @@ impl WgpuCompositor {let frame = self.device.create_buffer(&wgpu::BufferDescriptor {label: Some("concat pass frame"),// size(vec2), time, intensity, clip_time, padded to Frame's own- // 8-byte alignment (from its vec2 member): 20 bytes rounds to 24.- size: 24,+ // 16-byte alignment (OpenGL ES's, see concat-effects' Frame):+ // 20 bytes rounds to 32.+ size: 32,usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,mapped_at_creation: false,});