Skip to content

FilmCraft: An open-source, nonlinear video editor written by scratch in pure Rust

Refactor gpu for strict Clippy checks

Dylan M. Taylore974b7fe441d
diff --git a/crates/gpu/src/export_renderer.rs b/crates/gpu/src/export_renderer.rs
index f86f51a84..5bcba382a 100644
--- a/crates/gpu/src/export_renderer.rs
+++ b/crates/gpu/src/export_renderer.rs
@@ -186,7 +186,7 @@ mod tests {
p.add_item(
&info.name.clone(),
Label::Iris,
- ItemKind::Media(MediaClip {
+ ItemKind::Media(Box::new(MediaClip {
media: MediaRef::Generator(g.generator.clone()),
info,
interpret: Default::default(),
@@ -196,7 +196,7 @@ mod tests {
offline: false,
proxy: None,
identity: None,
- }),
+ })),
None,
)
};
diff --git a/crates/gpu/src/lib.rs b/crates/gpu/src/lib.rs
index 4f15697dd..d0b59fdd1 100644
--- a/crates/gpu/src/lib.rs
+++ b/crates/gpu/src/lib.rs
@@ -956,7 +956,7 @@ impl GpuCompositor {
std::mem::swap(&mut self.accum, &mut self.transition_inputs[index]);
views[index] = view;
}
- self.transition.draw(&self.device, &self.queue, &canvas, [&views[0], &views[1]], dims, effect, *progress);
+ self.transition.draw((&self.device, &self.queue), &canvas, [&views[0], &views[1]], dims, effect, *progress);
self.gpu_transitions += 1;
}
}
diff --git a/crates/gpu/src/transition.rs b/crates/gpu/src/transition.rs
index 119fb75c1..aa11ad92b 100644
--- a/crates/gpu/src/transition.rs
+++ b/crates/gpu/src/transition.rs
@@ -34,11 +34,9 @@ impl PushStage {
Self { pipeline }
}
- #[allow(clippy::too_many_arguments)]
pub fn draw(
&self,
- device: &wgpu::Device,
- queue: &wgpu::Queue,
+ (device, queue): (&wgpu::Device, &wgpu::Queue),
canvas: &wgpu::TextureView,
inputs: [&wgpu::TextureView; 2],
size: (u32, u32),
diff --git a/crates/gpu/tests/export_pipeline.rs b/crates/gpu/tests/export_pipeline.rs
index 94c211821..ba41bbb5f 100644
--- a/crates/gpu/tests/export_pipeline.rs
+++ b/crates/gpu/tests/export_pipeline.rs
@@ -41,7 +41,7 @@ fn project(width: u32, height: u32) -> (Arc<filmcraft_project::Project>, filmcra
let red = p.add_item(
&info.name.clone(),
Label::Iris,
- ItemKind::Media(MediaClip {
+ ItemKind::Media(Box::new(MediaClip {
media: MediaRef::Generator(g.generator.clone()),
info,
interpret: Default::default(),
@@ -51,7 +51,7 @@ fn project(width: u32, height: u32) -> (Arc<filmcraft_project::Project>, filmcra
offline: false,
proxy: None,
identity: None,
- }),
+ })),
None,
);
let seq = p.new_sequence("s", SequenceSettings { width, height, frame_rate: filmcraft_time::FrameRate::FPS_24, ..Default::default() }, 1, 1, None);