From 7bc14f02bc41dc0712618532c3373ba65e1cb4b9 Mon Sep 17 00:00:00 2001 From: Madeline Sparkles Date: Fri, 19 Jul 2024 12:46:55 +0800 Subject: [PATCH] update wgpu --- crates/bootstrap/Cargo.toml | 3 +-- crates/demo/Cargo.toml | 2 +- crates/yakui-app/Cargo.toml | 2 +- crates/yakui-app/src/lib.rs | 1 + crates/yakui-to-image/Cargo.toml | 2 +- crates/yakui-to-image/src/graphics.rs | 1 + crates/yakui-wgpu/Cargo.toml | 2 +- crates/yakui-wgpu/src/lib.rs | 2 ++ 8 files changed, 9 insertions(+), 6 deletions(-) diff --git a/crates/bootstrap/Cargo.toml b/crates/bootstrap/Cargo.toml index 4a860be1..f3f493de 100644 --- a/crates/bootstrap/Cargo.toml +++ b/crates/bootstrap/Cargo.toml @@ -20,6 +20,5 @@ log = "0.4.17" pollster = "0.3.0" profiling = "1.0.6" tracy-client = { version = "0.15.1", optional = true } - +wgpu = "22.0.0" winit = "0.30.0" -wgpu = "0.20.1" diff --git a/crates/demo/Cargo.toml b/crates/demo/Cargo.toml index 57ce5965..a8ecee0e 100644 --- a/crates/demo/Cargo.toml +++ b/crates/demo/Cargo.toml @@ -14,7 +14,7 @@ yakui-app = { path = "../yakui-app" } env_logger = "0.10.0" log = "0.4.17" pollster = "0.3.0" -wgpu = { version = "0.20.1", features = ["webgl"] } +wgpu = { version = "22.0.0", features = ["webgl"] } winit = "0.30.0" [target.'cfg(target_arch = "wasm32")'.dependencies] diff --git a/crates/yakui-app/Cargo.toml b/crates/yakui-app/Cargo.toml index 671caf01..fdc26193 100644 --- a/crates/yakui-app/Cargo.toml +++ b/crates/yakui-app/Cargo.toml @@ -18,4 +18,4 @@ yakui-wgpu = { path = "../yakui-wgpu" } profiling = { version = "1.0.6", optional = true } winit = { version = "0.30.0" } -wgpu = "0.20.1" +wgpu = "22.0.0" diff --git a/crates/yakui-app/src/lib.rs b/crates/yakui-app/src/lib.rs index 2ff7ee7e..1a199b3a 100644 --- a/crates/yakui-app/src/lib.rs +++ b/crates/yakui-app/src/lib.rs @@ -62,6 +62,7 @@ impl Graphics { } else { wgpu::Limits::default() }, + memory_hints: Default::default(), label: None, }, None, // Trace path diff --git a/crates/yakui-to-image/Cargo.toml b/crates/yakui-to-image/Cargo.toml index 5a6cd514..af9a2e65 100644 --- a/crates/yakui-to-image/Cargo.toml +++ b/crates/yakui-to-image/Cargo.toml @@ -11,6 +11,6 @@ edition = "2021" yakui-core = { path = "../yakui-core" } yakui-wgpu = { path = "../yakui-wgpu" } -wgpu = "0.20.1" +wgpu = "22.0.0" image = { version = "0.24.4", default-features = false, features = ["png"] } pollster = "0.3.0" diff --git a/crates/yakui-to-image/src/graphics.rs b/crates/yakui-to-image/src/graphics.rs index 940d68dd..cac70158 100644 --- a/crates/yakui-to-image/src/graphics.rs +++ b/crates/yakui-to-image/src/graphics.rs @@ -27,6 +27,7 @@ impl Graphics { &wgpu::DeviceDescriptor { required_features: wgpu::Features::empty(), required_limits: wgpu::Limits::default(), + memory_hints: Default::default(), label: None, }, None, diff --git a/crates/yakui-wgpu/Cargo.toml b/crates/yakui-wgpu/Cargo.toml index a57f1e73..118b3611 100644 --- a/crates/yakui-wgpu/Cargo.toml +++ b/crates/yakui-wgpu/Cargo.toml @@ -11,7 +11,7 @@ edition = "2021" [dependencies] yakui-core = { path = "../yakui-core", version = "0.2.0" } -wgpu = "0.20.1" +wgpu = "22.0.0" glam = { version = "0.27.0", features = ["bytemuck"] } bytemuck = { version = "1.12.1", features = ["derive"] } thunderdome = "0.6.0" diff --git a/crates/yakui-wgpu/src/lib.rs b/crates/yakui-wgpu/src/lib.rs index a3494888..d303b1be 100644 --- a/crates/yakui-wgpu/src/lib.rs +++ b/crates/yakui-wgpu/src/lib.rs @@ -472,6 +472,7 @@ fn make_main_pipeline( ..Default::default() }, multiview: None, + cache: None, }) } @@ -520,5 +521,6 @@ fn make_text_pipeline( ..Default::default() }, multiview: None, + cache: None, }) }