Skip to content

vello_cpu/vello_hybrid: use rect fast paths for rect fills and clips #114

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

Merged
nicoburns merged 3 commits into from
Oct 3, 2026
Merged

vello_cpu/vello_hybrid: use rect fast paths for rect fills and clips #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee68055
vello_cpu/vello_hybrid: use rect fast paths for rect fills and clips
nicoburns Oct 3, 2026
190b5d8
vello_cpu: use non-isolated push_clip_path for push_clip_layer
nicoburns Oct 3, 2026
fb79736
vello_cpu: keep isolated clip layers for non-rect clips when multi-th…
nicoburns Oct 3, 2026
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
86 changes: 81 additions & 5 deletions crates/anyrender_vello_cpu/src/scene.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,16 @@ use crate::image_cache::{ImageCache, ImageCacheConfig};

const DEFAULT_TOLERANCE: f64 = 0.1;

enum LayerKind {
Layer,
Clip,
}

pub struct VelloCpuScenePainter {
pub(crate) render_ctx: vello_cpu::RenderContext,
pub(crate) resources: vello_cpu::Resources,
pub(crate) image_cache: ImageCache,
layer_stack: Vec<LayerKind>,
}

impl VelloCpuScenePainter {
Expand All @@ -26,6 +32,7 @@ impl VelloCpuScenePainter {
render_ctx: vello_cpu::RenderContext::new(width, height),
resources: vello_cpu::Resources::new(),
image_cache: ImageCache::new(config),
layer_stack: Vec::new(),
}
}

Expand Down Expand Up @@ -68,6 +75,7 @@ impl RenderContext for VelloCpuScenePainter {}
impl PaintScene for VelloCpuScenePainter {
fn reset(&mut self) {
self.render_ctx.reset();
self.layer_stack.clear();
}

fn push_layer(
Expand All @@ -93,6 +101,7 @@ impl PaintScene for VelloCpuScenePainter {

self.render_ctx.set_transform(transform);
self.render_ctx.set_fill_rule(fill);
self.layer_stack.push(LayerKind::Layer);
self.render_ctx.push_layer(
Some(&clip.into_path(DEFAULT_TOLERANCE)),
Some(blend.into()),
Expand All @@ -105,12 +114,28 @@ impl PaintScene for VelloCpuScenePainter {
fn push_clip_layer(&mut self, fill: Fill, transform: Affine, clip: &impl Shape) {
self.render_ctx.set_transform(transform);
self.render_ctx.set_fill_rule(fill);
self.render_ctx
.push_clip_layer(&clip.into_path(DEFAULT_TOLERANCE));
if let Some(rect) = clip.as_rect() {
self.layer_stack.push(LayerKind::Clip);
self.render_ctx.push_clip_rect(&rect);
} else if self.render_ctx.is_multi_threaded() {
// The multi-threaded dispatcher flushes its pending work and rasterizes the clip on
// the main thread for every `push_clip_path`, which is slower than an isolated layer.
self.layer_stack.push(LayerKind::Layer);
self.render_ctx
.push_clip_layer(&clip.into_path(DEFAULT_TOLERANCE));
} else {
self.layer_stack.push(LayerKind::Clip);
self.render_ctx
.push_clip_path(&clip.into_path(DEFAULT_TOLERANCE));
}
}

fn pop_layer(&mut self) {
self.render_ctx.pop_layer();
match self.layer_stack.pop() {
Some(LayerKind::Layer) => self.render_ctx.pop_layer(),
Some(LayerKind::Clip) => self.render_ctx.pop_clip(),
None => {}
}
}

fn stroke<'a>(
Expand Down Expand Up @@ -145,8 +170,12 @@ impl PaintScene for VelloCpuScenePainter {
self.render_ctx.set_paint(paint);
self.render_ctx
.set_paint_transform(brush_transform.unwrap_or(Affine::IDENTITY));
self.render_ctx
.fill_path(&shape.into_path(DEFAULT_TOLERANCE));
if let Some(rect) = shape.as_rect() {
self.render_ctx.fill_rect(&rect);
} else {
self.render_ctx
.fill_path(&shape.into_path(DEFAULT_TOLERANCE));
}
}

fn draw_glyphs<'a, 's: 'a>(
Expand Down Expand Up @@ -287,6 +316,53 @@ mod clip_rule_tests {
assert_pixels(true, false);
}

#[test]
fn rect_clips_and_fills() {
let buffer = render_to_buffer::<VelloCpuImageRenderer, _>(
|scene| {
scene.push_layer(
Fill::NonZero,
Mix::Normal,
1.0,
Affine::IDENTITY,
&Rect::new(0.0, 0.0, 80.0, 100.0),
None,
None,
);
scene.push_clip_layer(
Fill::NonZero,
Affine::translate((20.0, 20.0)),
&Rect::new(0.0, 0.0, 80.0, 60.0),
);
scene.fill(
Fill::NonZero,
Affine::IDENTITY,
RED,
None,
&Rect::new(0.0, 0.0, 100.0, 100.0),
);
scene.pop_layer();
scene.pop_layer();
scene.fill(
Fill::NonZero,
Affine::IDENTITY,
RED,
None,
&Rect::new(90.0, 90.0, 100.0, 100.0),
);
},
100,
100,
);
let pixel = |x: usize, y: usize| &buffer[(y * 100 + x) * 4..(y * 100 + x) * 4 + 4];
assert_eq!(pixel(50, 50), &[255, 0, 0, 255]);
assert_eq!(pixel(10, 50), &[0, 0, 0, 0]);
assert_eq!(pixel(50, 10), &[0, 0, 0, 0]);
assert_eq!(pixel(50, 90), &[0, 0, 0, 0]);
assert_eq!(pixel(85, 50), &[0, 0, 0, 0]);
assert_eq!(pixel(95, 95), &[255, 0, 0, 255]);
}

#[test]
fn scene_replay_preserves_clip_rules() {
assert_pixels(false, true);
Expand Down
22 changes: 17 additions & 5 deletions crates/anyrender_vello_hybrid/src/scene.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,12 @@ impl PaintScene for VelloHybridScenePainter<'_> {
self.scene.set_transform(transform);
self.scene.set_fill_rule(fill);
self.layer_stack.push(LayerKind::Layer);
self.scene
.push_clip_path(&clip.into_path(DEFAULT_TOLERANCE));
if let Some(rect) = clip.as_rect() {
self.scene.push_clip_rect(&rect);
} else {
self.scene
.push_clip_path(&clip.into_path(DEFAULT_TOLERANCE));
}
self.scene
.push_layer(None, Some(blend.into()), Some(alpha), None, filter);
}
Expand All @@ -220,8 +224,12 @@ impl PaintScene for VelloHybridScenePainter<'_> {
self.scene.set_transform(transform);
self.scene.set_fill_rule(fill);
self.layer_stack.push(LayerKind::Clip);
self.scene
.push_clip_path(&clip.into_path(DEFAULT_TOLERANCE));
if let Some(rect) = clip.as_rect() {
self.scene.push_clip_rect(&rect);
} else {
self.scene
.push_clip_path(&clip.into_path(DEFAULT_TOLERANCE));
}
}

fn pop_layer(&mut self) {
Expand Down Expand Up @@ -267,7 +275,11 @@ impl PaintScene for VelloHybridScenePainter<'_> {
self.scene.set_paint(paint);
self.scene
.set_paint_transform(brush_transform.unwrap_or(Affine::IDENTITY));
self.scene.fill_path(&shape.into_path(DEFAULT_TOLERANCE));
if let Some(rect) = shape.as_rect() {
self.scene.fill_rect(&rect);
} else {
self.scene.fill_path(&shape.into_path(DEFAULT_TOLERANCE));
}
}

fn draw_glyphs<'a, 's: 'a>(
Expand Down
22 changes: 17 additions & 5 deletions crates/anyrender_vello_hybrid/src/webgl_scene.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,12 @@ impl PaintScene for WebGlScenePainter<'_> {
self.scene.set_transform(transform);
self.scene.set_fill_rule(fill);
self.layer_stack.push(LayerKind::Layer);
self.scene
.push_clip_path(&clip.into_path(DEFAULT_TOLERANCE));
if let Some(rect) = clip.as_rect() {
self.scene.push_clip_rect(&rect);
} else {
self.scene
.push_clip_path(&clip.into_path(DEFAULT_TOLERANCE));
}
self.scene
.push_layer(None, Some(blend.into()), Some(alpha), None, filter);
}
Expand All @@ -132,8 +136,12 @@ impl PaintScene for WebGlScenePainter<'_> {
self.scene.set_transform(transform);
self.scene.set_fill_rule(fill);
self.layer_stack.push(LayerKind::Clip);
self.scene
.push_clip_path(&clip.into_path(DEFAULT_TOLERANCE));
if let Some(rect) = clip.as_rect() {
self.scene.push_clip_rect(&rect);
} else {
self.scene
.push_clip_path(&clip.into_path(DEFAULT_TOLERANCE));
}
}

fn pop_layer(&mut self) {
Expand Down Expand Up @@ -179,7 +187,11 @@ impl PaintScene for WebGlScenePainter<'_> {
self.scene.set_paint(paint);
self.scene
.set_paint_transform(brush_transform.unwrap_or(Affine::IDENTITY));
self.scene.fill_path(&shape.into_path(DEFAULT_TOLERANCE));
if let Some(rect) = shape.as_rect() {
self.scene.fill_rect(&rect);
} else {
self.scene.fill_path(&shape.into_path(DEFAULT_TOLERANCE));
}
}

fn draw_glyphs<'a, 's2: 'a>(
Expand Down
Loading