From 6fe9e3b2737d67843a1a3249be46d7a6e475c2c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A2ris=20DOUADY?= Date: Thu, 20 Jun 2024 16:53:50 +0200 Subject: [PATCH] update to wgpu 0.20 --- crates/bootstrap/Cargo.toml | 2 +- crates/demo/Cargo.toml | 2 +- crates/yakui-app/Cargo.toml | 2 +- crates/yakui-to-image/Cargo.toml | 2 +- crates/yakui-wgpu/Cargo.toml | 2 +- crates/yakui-wgpu/src/lib.rs | 4 ++++ 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/crates/bootstrap/Cargo.toml b/crates/bootstrap/Cargo.toml index 3745b5cd..c7d2054c 100644 --- a/crates/bootstrap/Cargo.toml +++ b/crates/bootstrap/Cargo.toml @@ -20,5 +20,5 @@ log = "0.4.17" pollster = "0.3.0" profiling = "1.0.6" tracy-client = { version = "0.15.1", optional = true } -wgpu = "0.19.0" +wgpu = "0.20.1" winit = "0.29.2" diff --git a/crates/demo/Cargo.toml b/crates/demo/Cargo.toml index eb819e60..04959007 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.19.0", features = ["webgl"] } +wgpu = { version = "0.20.1", features = ["webgl"] } winit = "0.29.2" [target.'cfg(target_arch = "wasm32")'.dependencies] diff --git a/crates/yakui-app/Cargo.toml b/crates/yakui-app/Cargo.toml index 9ff1696d..a1aaa3a3 100644 --- a/crates/yakui-app/Cargo.toml +++ b/crates/yakui-app/Cargo.toml @@ -17,5 +17,5 @@ yakui-winit = { path = "../yakui-winit" } yakui-wgpu = { path = "../yakui-wgpu" } profiling = { version = "1.0.6", optional = true } -wgpu = "0.19.0" +wgpu = "0.20.1" winit = { version = "0.29.2", features = ["rwh_05"] } diff --git a/crates/yakui-to-image/Cargo.toml b/crates/yakui-to-image/Cargo.toml index a2c51c21..5a6cd514 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.19.0" +wgpu = "0.20.1" image = { version = "0.24.4", default-features = false, features = ["png"] } pollster = "0.3.0" diff --git a/crates/yakui-wgpu/Cargo.toml b/crates/yakui-wgpu/Cargo.toml index b36ec482..a57f1e73 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.19.0" +wgpu = "0.20.1" 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 4bc8f9c0..190e88f5 100644 --- a/crates/yakui-wgpu/src/lib.rs +++ b/crates/yakui-wgpu/src/lib.rs @@ -426,11 +426,13 @@ fn make_main_pipeline( vertex: wgpu::VertexState { module: &main_shader, entry_point: "vs_main", + compilation_options: Default::default(), buffers: &[Vertex::DESCRIPTOR], }, fragment: Some(wgpu::FragmentState { module: &main_shader, entry_point: "fs_main", + compilation_options: Default::default(), targets: &[Some(wgpu::ColorTargetState { format, blend: Some(wgpu::BlendState::ALPHA_BLENDING), @@ -472,11 +474,13 @@ fn make_text_pipeline( vertex: wgpu::VertexState { module: &text_shader, entry_point: "vs_main", + compilation_options: Default::default(), buffers: &[Vertex::DESCRIPTOR], }, fragment: Some(wgpu::FragmentState { module: &text_shader, entry_point: "fs_main", + compilation_options: Default::default(), targets: &[Some(wgpu::ColorTargetState { format, blend: Some(wgpu::BlendState::PREMULTIPLIED_ALPHA_BLENDING),