Upgrade to wgpu 23 and use workspace dependency (yay)

SecondHalfGames · Nov 30, 2024 · 7205a74 · 7205a74
1 parent 240e426
commit 7205a74
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,3 +2,6 @@
 resolver = "2"
 members = ["crates/*"]
 default-members = ["crates/*"]
+
+[workspace.dependencies]
+wgpu = "23.0.1"
diff --git a/crates/bootstrap/Cargo.toml b/crates/bootstrap/Cargo.toml
@@ -22,4 +22,4 @@ profiling = "1.0.6"
 tracy-client = { version = "0.15.1", optional = true }
 
 winit = "0.30.0"
-wgpu = "22.0.0"
+wgpu.workspace = true
diff --git 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 = "22.0.0", features = ["webgl"] }
+wgpu = { workspace = true, 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
@@ -17,4 +17,4 @@ yakui-wgpu = { path = "../yakui-wgpu", version = "0.3.0" }
 
 profiling = { version = "1.0.6", optional = true }
 winit = { version = "0.30.0" }
-wgpu = "22.0.0"
+wgpu.workspace = true
diff --git 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 = "22.0.0"
+wgpu.workspace = true
 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
@@ -11,7 +11,7 @@ edition = "2021"
 [dependencies]
 yakui-core = { path = "../yakui-core", version = "0.3.0" }
 
-wgpu = "22.0.0"
+wgpu.workspace = true
 glam = { version = "0.29.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
@@ -453,13 +453,13 @@ fn make_main_pipeline(
         layout: Some(layout),
         vertex: wgpu::VertexState {
             module: &main_shader,
-            entry_point: "vs_main",
+            entry_point: None,
             compilation_options: Default::default(),
             buffers: &[Vertex::DESCRIPTOR],
         },
         fragment: Some(wgpu::FragmentState {
             module: &main_shader,
-            entry_point: "fs_main",
+            entry_point: None,
             compilation_options: Default::default(),
             targets: &[Some(wgpu::ColorTargetState {
                 format,
@@ -502,13 +502,13 @@ fn make_text_pipeline(
         layout: Some(layout),
         vertex: wgpu::VertexState {
             module: &text_shader,
-            entry_point: "vs_main",
+            entry_point: None,
             compilation_options: Default::default(),
             buffers: &[Vertex::DESCRIPTOR],
         },
         fragment: Some(wgpu::FragmentState {
             module: &text_shader,
-            entry_point: "fs_main",
+            entry_point: None,
             compilation_options: Default::default(),
             targets: &[Some(wgpu::ColorTargetState {
                 format,