Merge pull request #112 from SupernaviX/wgpu-23.0

Update wgpu to 23.0

.github/workflows/build.yml

@@ -99,7 +99,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: check denies
-        uses: EmbarkStudios/cargo-deny-action@v1
+        uses: EmbarkStudios/cargo-deny-action@v2
         with:
           log-level: warn
           command: check

CHANGELOG.md

@@ -39,6 +39,8 @@ Per Keep a Changelog there are 6 main categories of changes:
 - Internal: Fixed Scissor-Rect to not span across Framebuffersize, by limiting to framebuffer width. @PixelboysTM
 - Bump wgpu version to 0.19. @mkrasnitski and @calcoph
 - Bump wgpu version to 22.1. @aftix
+- Bump wgpu version to 23.0. @SupernaviX
+- Internal: Update cargo-deny config to handle breaking changes. @SupernaviX
 
 ## v0.24.0
 

Cargo.toml

@@ -46,16 +46,16 @@ bytemuck = "1"
 imgui = "0.12"
 log = "0.4"
 smallvec = "1"
-wgpu = "22.1"
+wgpu = "23.0"
 
 [dev-dependencies]
 bytemuck = { version = "1.13", features = ["derive"] }
 cgmath = "0.18"
-env_logger = "0.10"
+env_logger = "0.11"
 image = { version = "0.24", default-features = false, features = ["png"] }
 imgui-winit-support = "0.13"
-pollster = "0.3"
-raw-window-handle = "0.5"
+pollster = "0.4"
+raw-window-handle = "0.6"
 winit = "0.30"
 
 [package.metadata.docs.rs]

deny.toml

@@ -1,31 +1,20 @@
 [licenses]
-unlicensed = "deny"
-allow-osi-fsf-free = "either"
 allow = [
     "Apache-2.0",
+    "CC0-1.0",
+    "ISC",
     "MIT",
-    "MPL-2.0",
+    "Unicode-3.0",
     "Unlicense",
+    "Zlib"
 ]
 
 [bans]
 multiple-versions = "deny"
 skip = [
-    { name = "syn", version = "2.0.82" },
     { name = "bitflags", version = "1.3.2" },
     { name = "hashbrown", version = "0.14.5" },
 ]
-skip-tree = [
-    { name = "winit", version = "0.27.5" },
-    { name = "windows-sys", version = "0.36.1" },
-]
-
-[advisories]
-vulnerability = "deny"
-unmaintained = "deny"
-ignore = [
-    "RUSTSEC-2022-0048"
-]
 
 [sources]
 unknown-registry = "deny"

examples/cube.rs

@@ -255,13 +255,13 @@ impl Example {
             layout: Some(&pipeline_layout),
             vertex: wgpu::VertexState {
                 module: &shader,
-                entry_point: "vs_main",
+                entry_point: Some("vs_main"),
                 compilation_options: Default::default(),
                 buffers: &vertex_buffers,
             },
             fragment: Some(wgpu::FragmentState {
                 module: &shader,
-                entry_point: "fs_main",
+                entry_point: Some("fs_main"),
                 compilation_options: Default::default(),
                 targets: &[Some(config.format.into())],
             }),

src/lib.rs

@@ -442,7 +442,7 @@ impl Renderer {
             layout: Some(&pipeline_layout),
             vertex: VertexState {
                 module: &shader_module,
-                entry_point: vertex_shader_entry_point.unwrap(),
+                entry_point: vertex_shader_entry_point,
                 compilation_options: Default::default(),
                 buffers: &[VertexBufferLayout {
                     array_stride: size_of::<DrawVert>() as BufferAddress,
@@ -472,7 +472,7 @@ impl Renderer {
             },
             fragment: Some(FragmentState {
                 module: &shader_module,
-                entry_point: fragment_shader_entry_point.unwrap(),
+                entry_point: fragment_shader_entry_point,
                 compilation_options: Default::default(),
                 targets: &[Some(ColorTargetState {
                     format: texture_format,
@@ -721,7 +721,7 @@ impl Renderer {
                     .textures
                     .get(texture_id)
                     .ok_or(RendererError::BadTexture(texture_id))?;
-                rpass.set_bind_group(1, &tex.bind_group, &[]);
+                rpass.set_bind_group(1, Some(tex.bind_group.as_ref()), &[]);
 
                 // Set scissors on the renderpass.
                 let end = start + count as u32;