Skip to content

Commit 283f6e6

Browse files
committed
Fixup for anyrender 0.6
Signed-off-by: Nico Burns <nico@nicoburns.com>
1 parent 7fce477 commit 283f6e6

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

crates/anyrender_tiny_skia/src/scene.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ impl PaintScene for TinySkiaScenePainter {
575575
) {
576576
let blend: BlendMode = blend.into();
577577
#[allow(deprecated)]
578-
if alpha == 1. && matches!(blend.mix, Mix::Normal | Mix::Clip) {
578+
if alpha == 1. && matches!(blend.mix, Mix::Normal) {
579579
let layer = self.non_clip_layer();
580580

581581
// Capture the current mask state before applying new clip
@@ -589,6 +589,9 @@ impl PaintScene for TinySkiaScenePainter {
589589
self.last_non_clip_layer = self.layers.len() - 1;
590590
}
591591
}
592+
fn push_clip_layer(&mut self, transform: Affine, clip: &impl Shape) {
593+
self.push_layer(Mix::Normal, 1.0, transform, clip);
594+
}
592595

593596
fn pop_layer(&mut self) {
594597
if self.layers.len() <= 1 {
@@ -897,7 +900,7 @@ enum BlendStrategy {
897900
fn determine_blend_strategy(peniko_mode: &BlendMode) -> BlendStrategy {
898901
match (peniko_mode.mix, peniko_mode.compose) {
899902
#[allow(deprecated)]
900-
(Mix::Normal | Mix::Clip, compose) => {
903+
(Mix::Normal, compose) => {
901904
BlendStrategy::SinglePass(compose_to_tiny_blend_mode(compose))
902905
}
903906
(mix, Compose::SrcOver) => BlendStrategy::SinglePass(mix_to_tiny_blend_mode(mix)),
@@ -945,8 +948,6 @@ fn mix_to_tiny_blend_mode(mix: Mix) -> TinyBlendMode {
945948
Mix::Saturation => TinyBlendMode::Saturation,
946949
Mix::Color => TinyBlendMode::Color,
947950
Mix::Luminosity => TinyBlendMode::Luminosity,
948-
#[allow(deprecated)]
949-
Mix::Clip => TinyBlendMode::SourceOver,
950951
}
951952
}
952953

0 commit comments

Comments
 (0)