From 2f2eaa5f00ae8fd280733313d391e0bcc37b0e14 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Fri, 22 Nov 2024 22:32:39 +0700 Subject: [PATCH] Update to wgpu 23.0.0 (#735) This also updates the MSRV to 1.76 to match the updated MSRV of wgpu 23. --- .github/workflows/ci.yml | 2 +- CHANGELOG.md | 7 +- Cargo.lock | 212 +++++++++++------------------- Cargo.toml | 6 +- README.md | 4 +- vello/README.md | 4 +- vello/src/wgpu_engine.rs | 6 +- vello_encoding/README.md | 2 +- vello_shaders/Cargo.toml | 4 +- vello_shaders/README.md | 2 +- vello_tests/tests/known_issues.rs | 2 + 11 files changed, 103 insertions(+), 148 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b925dcb1..7938cfccc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ env: # If the compilation fails, then the version specified here needs to be bumped up to reality. # Be sure to also update the rust-version property in the workspace Cargo.toml file, # plus all the README.md files of the affected packages. - RUST_MIN_VER: "1.75" + RUST_MIN_VER: "1.76" # List of packages that will be checked with the minimum supported Rust version. # This should be limited to packages that are intended for publishing. RUST_MIN_VER_PKGS: "-p vello -p vello_encoding -p vello_shaders" diff --git a/CHANGELOG.md b/CHANGELOG.md index d9bc6dfda..78796af3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,11 @@ You can find its changes [documented below](#030---2024-10-04). ## [Unreleased] -This release has an [MSRV][] of 1.75. +This release has an [MSRV][] of 1.76. + +### Changed + +- Breaking: Updated `wgpu` to 23.0.0, increased MSRV to 1.76 ([#735][] by [@waywardmonkeys]) ### Fixed @@ -191,6 +195,7 @@ This release has an [MSRV][] of 1.75. [#706]: https://github.com/linebender/vello/pull/706 [#711]: https://github.com/linebender/vello/pull/711 [#722]: https://github.com/linebender/vello/pull/722 +[#735]: https://github.com/linebender/vello/pull/735 [Unreleased]: https://github.com/linebender/vello/compare/v0.3.0...HEAD diff --git a/Cargo.lock b/Cargo.lock index 7837a2a2e..c5e5206ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -216,18 +216,18 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bit-set" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitflags" @@ -279,7 +279,7 @@ checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -404,7 +404,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -438,37 +438,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" -[[package]] -name = "com" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" -dependencies = [ - "com_macros", -] - -[[package]] -name = "com_macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" -dependencies = [ - "com_macros_support", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "com_macros_support" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "combine" version = "4.6.7" @@ -578,17 +547,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" -[[package]] -name = "d3d12" -version = "22.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" -dependencies = [ - "bitflags 2.6.0", - "libloading", - "winapi", -] - [[package]] name = "devserver_lib" version = "0.4.2" @@ -755,7 +713,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -837,9 +795,9 @@ dependencies = [ [[package]] name = "glow" -version = "0.13.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +checksum = "d51fa363f025f5c111e03f13eda21162faeacb6911fe8caa0c0349f9cf0c4483" dependencies = [ "js-sys", "slotmap", @@ -877,14 +835,13 @@ dependencies = [ [[package]] name = "gpu-allocator" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" +checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" dependencies = [ "log", "presser", "thiserror", - "winapi", "windows", ] @@ -941,21 +898,6 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" -[[package]] -name = "hassle-rs" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" -dependencies = [ - "bitflags 2.6.0", - "com", - "libc", - "libloading", - "thiserror", - "widestring", - "winapi", -] - [[package]] name = "headless" version = "0.0.0" @@ -1285,9 +1227,9 @@ dependencies = [ [[package]] name = "naga" -version = "22.1.0" +version = "23.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" +checksum = "3d5941e45a15b53aad4375eedf02033adb7a28931eedc31117faffa52e6a857e" dependencies = [ "arrayvec", "bit-set", @@ -1400,7 +1342,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -1725,7 +1667,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -1824,7 +1766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30" dependencies = [ "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -2039,7 +1981,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.85", + "syn", ] [[package]] @@ -2115,7 +2057,7 @@ checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -2126,7 +2068,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -2288,17 +2230,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.85" @@ -2349,7 +2280,7 @@ checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -2424,7 +2355,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -2606,7 +2537,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -2637,7 +2568,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.85", + "syn", "wasm-bindgen-shared", ] @@ -2705,7 +2636,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2917,9 +2848,9 @@ dependencies = [ [[package]] name = "wgpu" -version = "22.1.0" +version = "23.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" +checksum = "76ab52f2d3d18b70d5ab8dd270a1cff3ebe6dbe4a7d13c1cc2557138a9777fdc" dependencies = [ "arrayvec", "cfg_aliases 0.1.1", @@ -2942,9 +2873,9 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "22.1.0" +version = "23.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" +checksum = "0e0c68e7b6322a03ee5b83fcd92caeac5c2a932f6457818179f4652ad2a9c065" dependencies = [ "arrayvec", "bit-vec", @@ -2967,9 +2898,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "22.0.0" +version = "23.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" +checksum = "de6e7266b869de56c7e3ed72a954899f71d14fec6cc81c102b7530b92947601b" dependencies = [ "android_system_properties", "arrayvec", @@ -2977,15 +2908,14 @@ dependencies = [ "bit-set", "bitflags 2.6.0", "block", + "bytemuck", "cfg_aliases 0.1.1", "core-graphics-types", - "d3d12", "glow", "glutin_wgl_sys", "gpu-alloc", "gpu-allocator", "gpu-descriptor", - "hassle-rs", "js-sys", "khronos-egl", "libc", @@ -3007,14 +2937,15 @@ dependencies = [ "wasm-bindgen", "web-sys", "wgpu-types", - "winapi", + "windows", + "windows-core", ] [[package]] name = "wgpu-profiler" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06b2cee91fdc885ff0d3d714c59810cc72c6d84b81b0eaa48bab8ff2ad54fb5b" +checksum = "43016a1a244a8ca4c3543441dc68d0c970430c74d6d9a17ae016426e2d3fdb08" dependencies = [ "parking_lot", "thiserror", @@ -3023,9 +2954,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "22.0.0" +version = "23.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" +checksum = "610f6ff27778148c31093f3b03abc4840f9636d58d597ca2f5977433acfe0068" dependencies = [ "bitflags 2.6.0", "js-sys", @@ -3033,58 +2964,75 @@ dependencies = [ ] [[package]] -name = "widestring" -version = "1.1.0" +name = "winapi-util" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] [[package]] -name = "winapi" -version = "0.3.9" +name = "windows" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "windows-core", + "windows-targets 0.52.6", ] [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" +name = "windows-core" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] [[package]] -name = "winapi-util" -version = "0.1.9" +name = "windows-implement" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ - "windows-sys 0.59.0", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows-interface" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] -name = "windows" -version = "0.52.0" +name = "windows-result" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" dependencies = [ - "windows-core", "windows-targets 0.52.6", ] [[package]] -name = "windows-core" -version = "0.52.0" +name = "windows-strings" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ + "windows-result", "windows-targets 0.52.6", ] @@ -3474,7 +3422,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 7ee90a60c..ddfa873ee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ version = "0.3.0" edition = "2021" # Keep in sync with RUST_MIN_VER in .github/workflows/ci.yml, with the relevant README.md files # and with the MSRV in the `Unreleased` section of CHANGELOG.md. -rust-version = "1.75" +rust-version = "1.76" license = "Apache-2.0 OR MIT" repository = "https://github.com/linebender/vello" @@ -56,7 +56,7 @@ static_assertions = "1.1.0" thiserror = "1.0.64" # NOTE: Make sure to keep this in sync with the version badge in README.md and vello/README.md -wgpu = { version = "22.1.0" } +wgpu = { version = "23.0.0" } log = "0.4.22" image = { version = "0.25.2", default-features = false } @@ -65,5 +65,5 @@ clap = "4.5.19" anyhow = "1.0.89" pollster = "0.3.0" web-time = "1.1.0" -wgpu-profiler = "0.18.2" +wgpu-profiler = "0.19.0" scenes = { path = "examples/scenes" } diff --git a/README.md b/README.md index d89b75e62..476197648 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ For now, prefer updating the package-level readmes, e.g. vello/README.md. [![Linebender Zulip](https://img.shields.io/badge/Linebender-%23gpu-blue?logo=Zulip)](https://xi.zulipchat.com/#narrow/stream/197075-gpu) [![dependency status](https://deps.rs/repo/github/linebender/vello/status.svg)](https://deps.rs/repo/github/linebender/vello) [![MIT/Apache 2.0](https://img.shields.io/badge/license-MIT%2FApache-blue.svg)](#license) -[![wgpu version](https://img.shields.io/badge/wgpu-v22.0.0-orange.svg)](https://crates.io/crates/wgpu) +[![wgpu version](https://img.shields.io/badge/wgpu-v23.0.0-orange.svg)](https://crates.io/crates/wgpu) [![Crates.io](https://img.shields.io/crates/v/vello.svg)](https://crates.io/crates/vello) [![Docs](https://docs.rs/vello/badge.svg)](https://docs.rs/vello) @@ -231,7 +231,7 @@ VELLO_STATIC_LOG="vello=trace" VELLO_STATIC_ARGS="--test-scenes" cargo apk run - ## Minimum supported Rust Version (MSRV) -This version of Vello has been verified to compile with **Rust 1.75** and later. +This version of Vello has been verified to compile with **Rust 1.76** and later. Future versions of Vello might increase the Rust version requirement. It will not be treated as a breaking change and as such can even happen with small patch releases. diff --git a/vello/README.md b/vello/README.md index e6f1bb4de..242e3b960 100644 --- a/vello/README.md +++ b/vello/README.md @@ -7,7 +7,7 @@ [![Latest published version.](https://img.shields.io/crates/v/vello.svg)](https://crates.io/crates/vello) [![Documentation build status.](https://img.shields.io/docsrs/vello.svg)](https://docs.rs/vello) [![Apache 2.0 or MIT license.](https://img.shields.io/badge/license-Apache--2.0_OR_MIT-blue.svg)](#license) -[![Required wgpu version.](https://img.shields.io/badge/wgpu-v22.1.0-orange.svg)](https://crates.io/crates/wgpu) +[![Required wgpu version.](https://img.shields.io/badge/wgpu-v23.0.0-orange.svg)](https://crates.io/crates/wgpu) \ [![Linebender Zulip chat.](https://img.shields.io/badge/Linebender-%23gpu-blue?logo=Zulip)](https://xi.zulipchat.com/#narrow/stream/197075-gpu) [![GitHub Actions CI status.](https://img.shields.io/github/actions/workflow/status/linebender/vello/ci.yml?logo=github&label=CI)](https://github.com/linebender/vello/actions) @@ -220,7 +220,7 @@ VELLO_STATIC_LOG="vello=trace" VELLO_STATIC_ARGS="--test-scenes" cargo apk run - ## Minimum supported Rust Version (MSRV) -This version of Vello has been verified to compile with **Rust 1.75** and later. +This version of Vello has been verified to compile with **Rust 1.76** and later. Future versions of Vello might increase the Rust version requirement. It will not be treated as a breaking change and as such can even happen with small patch releases. diff --git a/vello/src/wgpu_engine.rs b/vello/src/wgpu_engine.rs index 0f80e5ddc..c3ad50bd1 100644 --- a/vello/src/wgpu_engine.rs +++ b/vello/src/wgpu_engine.rs @@ -331,7 +331,7 @@ impl WgpuEngine { layout: Some(&pipeline_layout), vertex: wgpu::VertexState { module, - entry_point: vertex_main, + entry_point: Some(vertex_main), buffers: vertex_buffer .as_ref() .map(core::slice::from_ref) @@ -340,7 +340,7 @@ impl WgpuEngine { }, fragment: Some(wgpu::FragmentState { module, - entry_point: fragment_main, + entry_point: Some(fragment_main), targets: &[Some(color_attachment)], compilation_options: PipelineCompilationOptions::default(), }), @@ -827,7 +827,7 @@ impl WgpuEngine { label: Some(label), layout: Some(&compute_pipeline_layout), module: &shader_module, - entry_point: "main", + entry_point: None, compilation_options: PipelineCompilationOptions { zero_initialize_workgroup_memory: false, ..Default::default() diff --git a/vello_encoding/README.md b/vello_encoding/README.md index 517d4c3c4..03d5aaafd 100644 --- a/vello_encoding/README.md +++ b/vello_encoding/README.md @@ -20,7 +20,7 @@ Significant changes are documented in [the changelog]. ## Minimum supported Rust Version (MSRV) -This version of Vello Encoding has been verified to compile with **Rust 1.75** and later. +This version of Vello Encoding has been verified to compile with **Rust 1.76** and later. Future versions of Vello Encoding might increase the Rust version requirement. It will not be treated as a breaking change and as such can even happen with small patch releases. diff --git a/vello_shaders/Cargo.toml b/vello_shaders/Cargo.toml index 01ff141ca..3e8924529 100644 --- a/vello_shaders/Cargo.toml +++ b/vello_shaders/Cargo.toml @@ -34,10 +34,10 @@ workspace = true [dependencies] bytemuck = { workspace = true, optional = true } -naga = { version = "22.1.0", features = ["wgsl-in"], optional = true } +naga = { version = "23.0.0", features = ["wgsl-in"], optional = true } thiserror = { workspace = true, optional = true } vello_encoding = { workspace = true, optional = true } [build-dependencies] -naga = { version = "22.1.0", features = ["wgsl-in"] } +naga = { version = "23.0.0", features = ["wgsl-in"] } thiserror = { workspace = true } diff --git a/vello_shaders/README.md b/vello_shaders/README.md index 6cb456f61..bb340efd6 100644 --- a/vello_shaders/README.md +++ b/vello_shaders/README.md @@ -24,7 +24,7 @@ Significant changes are documented in [the changelog]. ## Minimum supported Rust Version (MSRV) -This version of Vello Shaders has been verified to compile with **Rust 1.75** and later. +This version of Vello Shaders has been verified to compile with **Rust 1.76** and later. Future versions of Vello Shaders might increase the Rust version requirement. It will not be treated as a breaking change and as such can even happen with small patch releases. diff --git a/vello_tests/tests/known_issues.rs b/vello_tests/tests/known_issues.rs index 2bc16e101..f27d83e57 100644 --- a/vello_tests/tests/known_issues.rs +++ b/vello_tests/tests/known_issues.rs @@ -53,8 +53,10 @@ fn many_bins(use_cpu: bool) { assert!(black_count > 0); } +// With wgpu 23, this started mysteriously working on macOS (and only on macOS). #[test] #[cfg_attr(skip_gpu_tests, ignore)] +#[cfg_attr(target_os = "macos", should_panic)] fn many_bins_gpu() { many_bins(false); }