From 95ff96f71f8f8069608ad08985e2b1214dd42284 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 7 Jul 2023 07:12:37 +0200 Subject: Update `cosmic-text` and `glyphon` --- wgpu/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wgpu/Cargo.toml') diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index 22cfad55..a47c635a 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -45,7 +45,7 @@ path = "../graphics" [dependencies.glyphon] version = "0.2" git = "https://github.com/hecrj/glyphon.git" -rev = "8324f20158a62f8520bad4ed09f6aa5552f8f2a6" +rev = "886f47c0a9905af340b07a488c953ac00c4bf370" [dependencies.glam] version = "0.24" -- cgit From 1006206fb260e6382ddf50a543846ccb9ffa957b Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 20 Jul 2023 20:48:39 +0200 Subject: Use official `glyphon` repository instead of fork --- wgpu/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wgpu/Cargo.toml') diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index a47c635a..a0500f83 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -44,8 +44,8 @@ path = "../graphics" [dependencies.glyphon] version = "0.2" -git = "https://github.com/hecrj/glyphon.git" -rev = "886f47c0a9905af340b07a488c953ac00c4bf370" +git = "https://github.com/grovesNL/glyphon.git" +rev = "81dedbd04237e181c2118931c5f37d341aeb6837" [dependencies.glam] version = "0.24" -- cgit From e4b75ec9c76402dda7c6b6631918da240bb1c7ed Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 27 Jul 2023 16:51:06 +0200 Subject: Update `glyphon` to `0.3` :tada: --- wgpu/Cargo.toml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'wgpu/Cargo.toml') diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index a0500f83..3c08b569 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -15,13 +15,14 @@ web-colors = ["iced_graphics/web-colors"] [dependencies] wgpu = "0.16" +glyphon = "0.3" raw-window-handle = "0.5" -log = "0.4" guillotiere = "0.6" futures = "0.3" bitflags = "1.2" once_cell = "1.0" rustc-hash = "1.1" +log = "0.4" [target.'cfg(target_arch = "wasm32")'.dependencies] wgpu = { version = "0.16", features = ["webgl"] } @@ -42,11 +43,6 @@ features = ["derive"] version = "0.8" path = "../graphics" -[dependencies.glyphon] -version = "0.2" -git = "https://github.com/grovesNL/glyphon.git" -rev = "81dedbd04237e181c2118931c5f37d341aeb6837" - [dependencies.glam] version = "0.24" -- cgit From 126aef88e7647c4690055b4c96aee46ecadcf60e Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 28 Jul 2023 19:48:39 +0200 Subject: Bump versions :tada: --- wgpu/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wgpu/Cargo.toml') diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index 3c08b569..f3713eb9 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "iced_wgpu" -version = "0.10.0" +version = "0.11.0" authors = ["Héctor Ramón Jiménez "] edition = "2021" description = "A wgpu renderer for Iced" @@ -40,7 +40,7 @@ version = "1.9" features = ["derive"] [dependencies.iced_graphics] -version = "0.8" +version = "0.9" path = "../graphics" [dependencies.glam] -- cgit From 51ba0267a6e4f494197c5718b3c8d780d09f3497 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 2 Aug 2023 22:29:39 +0200 Subject: Bump version of `iced_wgpu` :tada: --- wgpu/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wgpu/Cargo.toml') diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index f3713eb9..69568099 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "iced_wgpu" -version = "0.11.0" +version = "0.11.1" authors = ["Héctor Ramón Jiménez "] edition = "2021" description = "A wgpu renderer for Iced" -- cgit From ed3454301e663a7cb7d73cd56b57b188f4d14a2f Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 30 Aug 2023 04:31:21 +0200 Subject: Implement explicit text caching in the widget state tree --- wgpu/Cargo.toml | 9 --------- 1 file changed, 9 deletions(-) (limited to 'wgpu/Cargo.toml') diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index 69568099..09740f54 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -21,20 +21,11 @@ guillotiere = "0.6" futures = "0.3" bitflags = "1.2" once_cell = "1.0" -rustc-hash = "1.1" log = "0.4" [target.'cfg(target_arch = "wasm32")'.dependencies] wgpu = { version = "0.16", features = ["webgl"] } -[dependencies.twox-hash] -version = "1.6" -default-features = false - -[target.'cfg(not(target_arch = "wasm32"))'.dependencies.twox-hash] -version = "1.6.1" -features = ["std"] - [dependencies.bytemuck] version = "1.9" features = ["derive"] -- cgit From 6cc354fdc4eec6576e0591cd3a2ce37155cbfa09 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 3 Sep 2023 00:21:04 +0200 Subject: Update `wgpu` to `0.17` --- wgpu/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wgpu/Cargo.toml') diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index 69568099..2fade559 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -14,8 +14,8 @@ svg = ["resvg"] web-colors = ["iced_graphics/web-colors"] [dependencies] -wgpu = "0.16" -glyphon = "0.3" +wgpu = "0.17" +glyphon = { git = "https://github.com/grovesNL/glyphon.git", rev = "20f0f8fa80e0d0df4c63634ce9176fa489546ca9" } raw-window-handle = "0.5" guillotiere = "0.6" futures = "0.3" -- cgit From d518e7d423f7069ed72d84e39a08e69ac07680fa Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 3 Sep 2023 00:28:05 +0200 Subject: Update `wgpu` for Wasm --- wgpu/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wgpu/Cargo.toml') diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index 2fade559..b0f70220 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -25,7 +25,7 @@ rustc-hash = "1.1" log = "0.4" [target.'cfg(target_arch = "wasm32")'.dependencies] -wgpu = { version = "0.16", features = ["webgl"] } +wgpu = { version = "0.17", features = ["webgl"] } [dependencies.twox-hash] version = "1.6" -- cgit From bb49a22996f39e32c3ced0c2d80c2137aed7a0ea Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 4 Sep 2023 03:28:45 +0200 Subject: Enable WebGPU backend in `wgpu` by default instead of WebGL Instead, we expose a new `webgl` feature. --- wgpu/Cargo.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'wgpu/Cargo.toml') diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index b0f70220..49c62673 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -12,6 +12,7 @@ geometry = ["iced_graphics/geometry", "lyon"] image = ["iced_graphics/image"] svg = ["resvg"] web-colors = ["iced_graphics/web-colors"] +webgl = ["wgpu/webgl"] [dependencies] wgpu = "0.17" @@ -24,9 +25,6 @@ once_cell = "1.0" rustc-hash = "1.1" log = "0.4" -[target.'cfg(target_arch = "wasm32")'.dependencies] -wgpu = { version = "0.17", features = ["webgl"] } - [dependencies.twox-hash] version = "1.6" default-features = false -- cgit From f468e25d0c67a01ee79d892f6e8ba9be019f06c7 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 4 Sep 2023 12:58:41 +0200 Subject: Use workspace dependencies and package inheritance We are also taking this as a chance to synchronize the versions of all the crates! Because of this, we will skip the `0.11` version. --- wgpu/Cargo.toml | 90 +++++++++++++++++++++++++-------------------------------- 1 file changed, 40 insertions(+), 50 deletions(-) (limited to 'wgpu/Cargo.toml') diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index 49c62673..97594f1a 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -1,11 +1,18 @@ [package] name = "iced_wgpu" -version = "0.11.1" -authors = ["Héctor Ramón Jiménez "] -edition = "2021" -description = "A wgpu renderer for Iced" -license = "MIT AND OFL-1.1" -repository = "https://github.com/iced-rs/iced" +description = "A renderer for iced on top of wgpu" +version.workspace = true +edition.workspace = true +authors.workspace = true +license.workspace = true +repository.workspace = true +homepage.workspace = true +categories.workspace = true +keywords.workspace = true + +[package.metadata.docs.rs] +rustdoc-args = ["--cfg", "docsrs"] +all-features = true [features] geometry = ["iced_graphics/geometry", "lyon"] @@ -15,47 +22,30 @@ web-colors = ["iced_graphics/web-colors"] webgl = ["wgpu/webgl"] [dependencies] -wgpu = "0.17" -glyphon = { git = "https://github.com/grovesNL/glyphon.git", rev = "20f0f8fa80e0d0df4c63634ce9176fa489546ca9" } -raw-window-handle = "0.5" -guillotiere = "0.6" -futures = "0.3" -bitflags = "1.2" -once_cell = "1.0" -rustc-hash = "1.1" -log = "0.4" - -[dependencies.twox-hash] -version = "1.6" -default-features = false - -[target.'cfg(not(target_arch = "wasm32"))'.dependencies.twox-hash] -version = "1.6.1" -features = ["std"] - -[dependencies.bytemuck] -version = "1.9" -features = ["derive"] - -[dependencies.iced_graphics] -version = "0.9" -path = "../graphics" - -[dependencies.glam] -version = "0.24" - -[dependencies.lyon] -version = "1.0" -optional = true - -[dependencies.resvg] -version = "0.35" -optional = true - -[dependencies.tracing] -version = "0.1.6" -optional = true - -[package.metadata.docs.rs] -rustdoc-args = ["--cfg", "docsrs"] -all-features = true +iced_graphics.workspace = true + +bitflags.workspace = true +bytemuck.workspace = true +futures.workspace = true +glam.workspace = true +glyphon.workspace = true +guillotiere.workspace = true +log.workspace = true +once_cell.workspace = true +raw-window-handle.workspace = true +rustc-hash.workspace = true +twox-hash.workspace = true +wgpu.workspace = true + +lyon.workspace = true +lyon.optional = true + +resvg.workspace = true +resvg.optional = true + +tracing.workspace = true +tracing.optional = true + +[target.'cfg(not(target_arch = "wasm32"))'.dependencies] +twox-hash.workspace = true +twox-hash.features = ["std"] -- cgit