Open source Loom alternative. Beautiful, shareable screen recordings.
Rust appcapcossloommacnextjsnextjs15open-sourceossreactrecordrustscreen-capturescreen-recorderscreenshotsolidjstauritauri-apptypescriptvite
perf(gpui): reuse color preset previews across editor lifetimes
Tadhg Dowdallda545c71fef0
diff --git a/apps/desktop-gpui/src/editor_color.rs b/apps/desktop-gpui/src/editor_color.rsindex a3948bee9..414d9d746 100644--- a/apps/desktop-gpui/src/editor_color.rs+++ b/apps/desktop-gpui/src/editor_color.rs@@ -35,7 +35,7 @@//! Nine 216x122 tiles are generated once, on first paint, and cached for the//! process: the catalogue is static, so nothing can invalidate them.-use std::sync::Arc;+use std::sync::{Arc, OnceLock};pub use cap_gpui_kernels::texture::{Filter, Overlay};use cap_project::{ColorCorrection, ProjectConfiguration};@@ -505,16 +505,15 @@ impl EditorWindow {});}- /// The tile grid's images, generated once per process.- fn preset_image(&self, index: usize) -> Option<Arc<RenderImage>> {+ fn preset_image(index: usize) -> Option<Arc<RenderImage>> {let preset = COLOR_CORRECTION_PRESETS.get(index)?;- let mut cache = self.sidebar.grade_previews.borrow_mut();- if let Some(image) = cache.get(preset.id) {- return Some(image.clone());- }- let image = preset_preview(preset, PREVIEW_WIDTH, PREVIEW_HEIGHT);- cache.insert(preset.id, image.clone());- Some(image)+ static PREVIEWS: [OnceLock<Arc<RenderImage>>; COLOR_CORRECTION_PRESETS.len()] =+ [const { OnceLock::new() }; COLOR_CORRECTION_PRESETS.len()];+ Some(+ PREVIEWS[index]+ .get_or_init(|| preset_preview(preset, PREVIEW_WIDTH, PREVIEW_HEIGHT))+ .clone(),+ )}/// The whole section: the preset grid, Grain, the screen-only "Apply to@@ -577,7 +576,7 @@ impl EditorWindow {.h(px(60.75)).rounded(px(6.)).overflow_hidden()- .children(self.preset_image(index).map(|image| {+ .children(Self::preset_image(index).map(|image| {img(image).size_full().object_fit(gpui::ObjectFit::Fill)})),)@@ -679,6 +678,24 @@ mod tests {gradient_position, overlay_blend, vignette_alpha,};+ #[test]+ fn cached_previews_preserve_pixels_and_share_images() {+ for (index, preset) in COLOR_CORRECTION_PRESETS.iter().enumerate() {+ let image = EditorWindow::preset_image(index).unwrap();+ let expected = preset_preview(preset, PREVIEW_WIDTH, PREVIEW_HEIGHT);+ assert_eq!(image.as_bytes(0), expected.as_bytes(0));+ assert!(Arc::ptr_eq(+ &image,+ &EditorWindow::preset_image(index).unwrap(),+ ));+ let id = image.id;+ drop(image);+ assert_eq!(EditorWindow::preset_image(index).unwrap().id, id);+ }+ assert!(EditorWindow::preset_image(COLOR_CORRECTION_PRESETS.len()).is_none());+ assert!(EditorWindow::preset_image(usize::MAX).is_none());+ }+#[test]fn the_catalogue_matches_the_source() {assert_eq!(COLOR_CORRECTION_PRESETS.len(), 9);diff --git a/apps/desktop-gpui/src/editor_sidebar.rs b/apps/desktop-gpui/src/editor_sidebar.rsindex 186d4e180..aa0b851af 100644--- a/apps/desktop-gpui/src/editor_sidebar.rs+++ b/apps/desktop-gpui/src/editor_sidebar.rs@@ -800,9 +800,6 @@ pub struct SidebarState {/// `ColorCorrectionSection`'s `adjustOpen` signal -- one per instance, so/// the Background tab's and the Camera tab's open independently.grade_adjust: [CollapsibleState; 2],- /// The nine preset tiles, generated once for the process. The catalogue is- /// static, so nothing can invalidate them.- pub(crate) grade_previews: std::cell::RefCell<HashMap<&'static str, Arc<RenderImage>>>,/// The camera tab's own `ShadowSettings` reveal, and the cursor tab's/// `KCollapsible open={!project.cursor.raw}` physics panel.pub camera_shadow_open: CollapsibleState,@@ -906,7 +903,6 @@ impl SidebarState {pads: std::cell::RefCell::new(HashMap::new()),pad_drag: None,grade_adjust: [CollapsibleState::new(false), CollapsibleState::new(false)],- grade_previews: std::cell::RefCell::new(HashMap::new()),camera_shadow_open: CollapsibleState::new(false),cursor_physics_open: CollapsibleState::new(!config.cursor.raw),cursor_ripple_open: CollapsibleState::new(config.cursor.ripple.enabled),