Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

perf(rendering): pass the shared project to the latest uniform call sites

Aditya Garuda1386d8ac33a
diff --git a/crates/rendering/src/layers/captions.rs b/crates/rendering/src/layers/captions.rs
index d90e94c0d..3240e9360 100644
--- a/crates/rendering/src/layers/captions.rs
+++ b/crates/rendering/src/layers/captions.rs
@@ -1387,15 +1387,23 @@ mod gpu_tests {
let mut zoom = ZoomTransformTimeline::from_project(&project, &cursor, 60.0, size);
zoom.ensure_precomputed_until(60.0);
let mut uniforms = ProjectUniforms::new(
- constants, &project, 0, FPS, size, &cursor, &frames, 60.0, &zoom,
+ constants,
+ &std::sync::Arc::new(project),
+ 0,
+ FPS,
+ size,
+ &cursor,
+ &frames,
+ 60.0,
+ &zoom,
);
uniforms.output_size = (size.x, size.y);
- uniforms.project.captions = Some(CaptionsData {
+ std::sync::Arc::make_mut(&mut uniforms.project).captions = Some(CaptionsData {
segments: vec![],
settings,
source_timed: false,
});
- uniforms.project.timeline = Some(TimelineConfiguration {
+ std::sync::Arc::make_mut(&mut uniforms.project).timeline = Some(TimelineConfiguration {
segments: vec![],
transitions: vec![],
zoom_segments: vec![],
diff --git a/crates/rendering/src/layers/keyboard.rs b/crates/rendering/src/layers/keyboard.rs
index eebbb1fea..123ef0c12 100644
--- a/crates/rendering/src/layers/keyboard.rs
+++ b/crates/rendering/src/layers/keyboard.rs
@@ -912,16 +912,24 @@ mod gpu_tests {
let mut zoom = ZoomTransformTimeline::from_project(&project, &cursor, 60.0, size);
zoom.ensure_precomputed_until(60.0);
let mut uniforms = ProjectUniforms::new(
- constants, &project, 0, FPS, size, &cursor, &frames, 60.0, &zoom,
+ constants,
+ &std::sync::Arc::new(project),
+ 0,
+ FPS,
+ size,
+ &cursor,
+ &frames,
+ 60.0,
+ &zoom,
);
uniforms.output_size = (size.x, size.y);
- uniforms.project.keyboard = Some(KeyboardData {
+ std::sync::Arc::make_mut(&mut uniforms.project).keyboard = Some(KeyboardData {
settings: KeyboardSettings {
enabled: true,
..Default::default()
},
});
- uniforms.project.timeline = Some(TimelineConfiguration {
+ std::sync::Arc::make_mut(&mut uniforms.project).timeline = Some(TimelineConfiguration {
segments: vec![],
transitions: vec![],
zoom_segments: vec![],
@@ -1062,7 +1070,13 @@ mod gpu_tests {
|layer: &mut KeyboardLayer, size: XY<u32>, edit: fn(&mut KeyboardSettings)| {
let mut uniforms = uniforms(&constants, &segments, size);
uniforms.frame_number = 96;
- edit(&mut uniforms.project.keyboard.as_mut().unwrap().settings);
+ edit(
+ &mut std::sync::Arc::make_mut(&mut uniforms.project)
+ .keyboard
+ .as_mut()
+ .unwrap()
+ .settings,
+ );
layer.prepare(&uniforms, &frames, size, &constants, None);
assert!(layer.has_content());
render_pixels(&constants, layer, size)
diff --git a/crates/rendering/src/lib.rs b/crates/rendering/src/lib.rs
index 673d27e32..af80e4a68 100644
--- a/crates/rendering/src/lib.rs
+++ b/crates/rendering/src/lib.rs
@@ -9548,6 +9548,7 @@ mod project_uniforms_tests {
}
);
let zoom = ZoomTransformTimeline::from_project(&project, &events, 4.0, size);
+ let project = Arc::new(project);
let source = DecodedFrame::new(vec![160; 320 * 180 * 4], size.x, size.y);
let mut ordered_renderer = FrameRenderer::new(&constants);
let mut linear_renderer = FrameRenderer::new(&constants);
@@ -9666,6 +9667,7 @@ mod project_uniforms_tests {
f64::from(duration_secs),
size,
);
+ let project = Arc::new(project);
let mut renderer = FrameRenderer::new(&constants);
let mut layers = RendererLayers::new(&constants.device, &constants.queue);
let mut random = 0x9e37_79b9_u32;