Skip to content

imaging_skia: use native Skia layers for masks #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jrmoulton wants to merge 1 commit into
base: main
Choose a base branch
from
Open

imaging_skia: use native Skia layers for masks #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 7 additions & 28 deletions imaging_skia/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,8 @@ use imaging::{
use kurbo::{Affine, Shape as _};
use peniko::color::{ColorSpaceTag, HueDirection};
use peniko::{BrushRef, ImageAlphaType, ImageFormat, ImageQuality, InterpolationAlphaSpace};
use skia_safe as sk;
use std::{cell::RefCell, rc::Rc};

use sinks::MaskCache;
pub use sinks::{SkCanvasSink, SkPictureRecorderSink};
use skia_safe as sk;

/// Errors that can occur when rendering via Skia.
#[derive(Debug)]
Expand Down Expand Up @@ -156,7 +153,6 @@ pub struct SkiaRenderer {
width: i32,
height: i32,
tolerance: f64,
mask_cache: Rc<RefCell<MaskCache>>,
}

impl SkiaRenderer {
Expand All @@ -181,26 +177,16 @@ impl SkiaRenderer {
width,
height,
tolerance: 0.1,
mask_cache: Rc::new(RefCell::new(MaskCache::default())),
}
}

/// Set the tolerance used when converting shapes to paths.
pub fn set_tolerance(&mut self, tolerance: f64) {
if self.tolerance != tolerance {
self.mask_cache.borrow_mut().clear();
}
self.tolerance = tolerance;
}

/// Drop any realized mask artifacts cached by the renderer.
///
/// The cache is renderer-scoped so unchanged masked subscenes can be reused across renders.
/// Call this if you need to release memory aggressively or after changing assumptions that
/// affect mask realization outside the recorded scene itself.
pub fn clear_cached_masks(&mut self) {
self.mask_cache.borrow_mut().clear();
}
/// No-op retained for API compatibility after native Skia masking removed realized mask caches.
pub fn clear_cached_masks(&mut self) {}

@waywardmonkeys waywardmonkeys Apr 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for this no-op compatibility thing. And can remove the associated tests as well ...


fn reset(&mut self) {
let canvas = self.surface.canvas();
Expand All @@ -213,8 +199,7 @@ impl SkiaRenderer {
pub fn render_scene_rgba8(&mut self, scene: &Scene) -> Result<Vec<u8>, Error> {
scene.validate().map_err(Error::InvalidScene)?;
self.reset();
let mut sink =
SkCanvasSink::new_with_mask_cache(self.surface.canvas(), Rc::clone(&self.mask_cache));
let mut sink = SkCanvasSink::new(self.surface.canvas());
sink.set_tolerance(self.tolerance);
replay(scene, &mut sink);
sink.finish()?;
Expand Down Expand Up @@ -735,36 +720,30 @@ mod tests {
let mut renderer = SkiaRenderer::new(64, 64);

renderer.render_scene_rgba8(&scene).unwrap();
assert_eq!(renderer.mask_cache.borrow().len(), 1);

renderer.render_scene_rgba8(&scene).unwrap();
assert_eq!(renderer.mask_cache.borrow().len(), 1);
}

#[test]
fn clear_cached_masks_drops_realized_masks() {
fn clear_cached_masks_is_a_no_op_without_realized_masks() {
let scene = masked_scene(MaskMode::Luminance);
let mut renderer = SkiaRenderer::new(64, 64);

renderer.render_scene_rgba8(&scene).unwrap();
assert_eq!(renderer.mask_cache.borrow().len(), 1);

renderer.clear_cached_masks();
assert_eq!(renderer.mask_cache.borrow().len(), 0);

renderer.render_scene_rgba8(&scene).unwrap();
assert_eq!(renderer.mask_cache.borrow().len(), 1);
}

#[test]
fn changing_tolerance_clears_cached_masks() {
fn changing_tolerance_keeps_masked_rendering_working() {
let scene = masked_scene(MaskMode::Alpha);
let mut renderer = SkiaRenderer::new(64, 64);

renderer.render_scene_rgba8(&scene).unwrap();
assert_eq!(renderer.mask_cache.borrow().len(), 1);

renderer.set_tolerance(0.25);
assert_eq!(renderer.mask_cache.borrow().len(), 0);
renderer.render_scene_rgba8(&scene).unwrap();
}
}
Loading
Loading