From 94e13d51e0232a9e7ed6340c8cc33372bcf5f8ff Mon Sep 17 00:00:00 2001 From: Simon Gellis Date: Thu, 14 Nov 2024 23:47:20 -0500 Subject: [PATCH 1/4] Update to wgpu 23.0 --- Cargo.toml | 2 +- examples/cube.rs | 4 ++-- src/lib.rs | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 28fcfff..c4bbcae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ bytemuck = "1" imgui = "0.12" log = "0.4" smallvec = "1" -wgpu = "22.1" +wgpu = "23.0" [dev-dependencies] bytemuck = { version = "1.13", features = ["derive"] } diff --git a/examples/cube.rs b/examples/cube.rs index 11e2a86..2663162 100644 --- a/examples/cube.rs +++ b/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())], }), diff --git a/src/lib.rs b/src/lib.rs index 1d0a822..2132a3a 100644 --- a/src/lib.rs +++ b/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::() 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; From 713caefa0d139ea03dc663ce005240da8b93b5b5 Mon Sep 17 00:00:00 2001 From: Simon Gellis Date: Fri, 15 Nov 2024 00:10:06 -0500 Subject: [PATCH 2/4] Fix issues with latest cargo-deny version --- .github/workflows/build.yml | 2 +- Cargo.toml | 6 +++--- deny.toml | 19 ++++--------------- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5f7e9a6..974fd46 100644 --- a/.github/workflows/build.yml +++ b/.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 diff --git a/Cargo.toml b/Cargo.toml index c4bbcae..6995a1d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,11 +51,11 @@ 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] diff --git a/deny.toml b/deny.toml index e75c8ef..02e04da 100644 --- a/deny.toml +++ b/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-DFS-2016", "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" From 5bb8673e256b6b5ad497a3baa2dc151545025f12 Mon Sep 17 00:00:00 2001 From: Simon Gellis Date: Fri, 15 Nov 2024 00:10:45 -0500 Subject: [PATCH 3/4] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 965d9e9..7dbc724 100644 --- a/CHANGELOG.md +++ b/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 From 7c0ac797d449c7c22adfda6f686894dc91e0869d Mon Sep 17 00:00:00 2001 From: Simon Gellis Date: Sat, 23 Nov 2024 16:35:36 -0500 Subject: [PATCH 4/4] Update cargo-deny for latest versions of dependent crates --- deny.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deny.toml b/deny.toml index 02e04da..edfe897 100644 --- a/deny.toml +++ b/deny.toml @@ -4,7 +4,7 @@ allow = [ "CC0-1.0", "ISC", "MIT", - "Unicode-DFS-2016", + "Unicode-3.0", "Unlicense", "Zlib" ]