From 92d61e5c592818745abbab245a82cb14b262ae67 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 5 Apr 2023 19:23:48 +0200 Subject: Use `softbuffer` fork with owned pixel buffer --- tiny_skia/Cargo.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index 349f6903..db590fc2 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -10,7 +10,6 @@ geometry = ["iced_graphics/geometry"] [dependencies] raw-window-handle = "0.5" -softbuffer = "0.2" tiny-skia = "0.8" bytemuck = "1" rustc-hash = "1.1" @@ -22,6 +21,10 @@ version = "0.7" path = "../graphics" features = ["tiny-skia"] +[dependencies.softbuffer] +git = "https://github.com/rust-windowing/softbuffer" +rev = "872c66a4c05fd7cb6cb133154f75fdce45a175a6" + [dependencies.cosmic-text] features = ["std", "swash"] git = "https://github.com/pop-os/cosmic-text" -- cgit From 940a47eafd098dce3567a95c38dc8697b0fc7115 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 5 Apr 2023 19:30:07 +0200 Subject: Revert "Use `softbuffer` fork with owned pixel buffer" This reverts commit 92d61e5c592818745abbab245a82cb14b262ae67. The owned pixel buffer zeroes the data in some platforms. `softbuffer` will need some first-class support for damage regions. --- tiny_skia/Cargo.toml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index db590fc2..349f6903 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -10,6 +10,7 @@ geometry = ["iced_graphics/geometry"] [dependencies] raw-window-handle = "0.5" +softbuffer = "0.2" tiny-skia = "0.8" bytemuck = "1" rustc-hash = "1.1" @@ -21,10 +22,6 @@ version = "0.7" path = "../graphics" features = ["tiny-skia"] -[dependencies.softbuffer] -git = "https://github.com/rust-windowing/softbuffer" -rev = "872c66a4c05fd7cb6cb133154f75fdce45a175a6" - [dependencies.cosmic-text] features = ["std", "swash"] git = "https://github.com/pop-os/cosmic-text" -- cgit From 16e6efe020e75d51958875fa198196534679af8d Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 8 Apr 2023 05:58:27 +0200 Subject: Use `pixels` for presentation in `iced_tiny_skia` when possible --- tiny_skia/Cargo.toml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index 7a5f5b17..731e06de 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -4,6 +4,8 @@ version = "0.1.0" edition = "2021" [features] +default = ["gpu"] +gpu = ["pixels"] image = ["iced_graphics/image"] svg = ["resvg"] geometry = ["iced_graphics/geometry"] @@ -31,6 +33,10 @@ default-features = false version = "1.6.1" features = ["std"] +[dependencies.pixels] +version = "0.12" +optional = true + [dependencies.resvg] version = "0.29" optional = true -- cgit From 435b54e57ecdaf08b1f36626f0000438895c909d Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 26 Apr 2023 16:09:36 +0200 Subject: Revert "Use `pixels` for presentation in `iced_tiny_skia` when possible" This reverts commit 16e6efe020e75d51958875fa198196534679af8d. --- tiny_skia/Cargo.toml | 6 ------ 1 file changed, 6 deletions(-) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index a8342e5f..f629dab9 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -4,8 +4,6 @@ version = "0.1.0" edition = "2021" [features] -default = ["gpu"] -gpu = ["pixels"] image = ["iced_graphics/image"] svg = ["resvg"] geometry = ["iced_graphics/geometry"] @@ -33,10 +31,6 @@ default-features = false version = "1.6.1" features = ["std"] -[dependencies.pixels] -version = "0.12" -optional = true - [dependencies.resvg] version = "0.29" optional = true -- cgit From 9c63eb7df559e58b14188b4096e9bd206444bbf3 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 26 Apr 2023 16:46:27 +0200 Subject: Update `tiny-skia` and `resvg` --- tiny_skia/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tiny_skia/Cargo.toml') diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml index f629dab9..a3bddc93 100644 --- a/tiny_skia/Cargo.toml +++ b/tiny_skia/Cargo.toml @@ -11,7 +11,7 @@ geometry = ["iced_graphics/geometry"] [dependencies] raw-window-handle = "0.5" softbuffer = "0.2" -tiny-skia = "0.8" +tiny-skia = "0.9" cosmic-text = "0.8" bytemuck = "1" rustc-hash = "1.1" @@ -32,5 +32,5 @@ version = "1.6.1" features = ["std"] [dependencies.resvg] -version = "0.29" +version = "0.32" optional = true -- cgit