From f63b163c535338c14b858401eba640c77d2b289f Mon Sep 17 00:00:00 2001 From: Kevin Reid Date: Wed, 30 Oct 2024 11:43:26 -0700 Subject: [PATCH] Deps: Update `wgpu` to 23.0.0. * `wgpu` API change: `entry_point`s are now optional. * Had to update `wasm-bindgen-test` to keep wasm tests working. --- Cargo.lock | 202 ++++++++----- Cargo.toml | 6 +- all-is-cubes-desktop/src/winit.rs | 1 - all-is-cubes-gpu/Cargo.toml | 2 +- all-is-cubes-gpu/src/in_wgpu/bloom.rs | 8 +- all-is-cubes-gpu/src/in_wgpu/pipelines.rs | 26 +- all-is-cubes-gpu/src/in_wgpu/postprocess.rs | 6 +- all-is-cubes-gpu/src/in_wgpu/rerun_image.rs | 14 +- .../src/in_wgpu/shader_testing.rs | 4 +- all-is-cubes-wasm/Cargo.lock | 271 +++++++++--------- all-is-cubes-wasm/Cargo.toml | 12 +- 11 files changed, 306 insertions(+), 246 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 62ad18e15..36ab5320d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -171,7 +171,7 @@ dependencies = [ "tokio", "trycmd", "unicode-width 0.2.0", - "wgpu 22.1.0", + "wgpu 23.0.0", "winit", "yield-progress", ] @@ -207,7 +207,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "web-time", - "wgpu 22.1.0", + "wgpu 23.0.0", ] [[package]] @@ -902,11 +902,11 @@ dependencies = [ [[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 0.7.0", + "bit-vec 0.8.0", ] [[package]] @@ -917,9 +917,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[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" @@ -1689,17 +1689,6 @@ dependencies = [ "winapi", ] -[[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 0.8.4", - "winapi", -] - [[package]] name = "dasp_sample" version = "0.11.0" @@ -2492,6 +2481,18 @@ dependencies = [ "web-sys", ] +[[package]] +name = "glow" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d51fa363f025f5c111e03f13eda21162faeacb6911fe8caa0c0349f9cf0c4483" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gltf" version = "1.4.1" @@ -2583,15 +2584,14 @@ 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 0.52.0", + "windows 0.57.0", ] [[package]] @@ -3087,9 +3087,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -3499,12 +3499,12 @@ dependencies = [ [[package]] name = "naga" -version = "22.0.0" +version = "23.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09eeccb9b50f4f7839b214aa3e08be467159506a986c18e0702170ccf720a453" +checksum = "3d5941e45a15b53aad4375eedf02033adb7a28931eedc31117faffa52e6a857e" dependencies = [ "arrayvec", - "bit-set 0.6.0", + "bit-set 0.8.0", "bitflags 2.6.0", "cfg_aliases 0.1.1", "codespan-reporting", @@ -4050,9 +4050,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oorandom" @@ -5937,23 +5937,23 @@ dependencies = [ "tinytemplate", "tokio", "wgpu 0.19.4", - "wgpu 22.1.0", + "wgpu 23.0.0", ] [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", @@ -6304,9 +6304,9 @@ checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "unindent" @@ -6429,9 +6429,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -6470,9 +6470,9 @@ checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -6515,9 +6515,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", @@ -6532,9 +6532,9 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core 22.1.0", - "wgpu-hal 22.0.0", - "wgpu-types 22.0.0", + "wgpu-core 23.0.0", + "wgpu-hal 23.0.0", + "wgpu-types 23.0.0", ] [[package]] @@ -6565,18 +6565,18 @@ 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 0.7.0", + "bit-vec 0.8.0", "bitflags 2.6.0", "cfg_aliases 0.1.1", "document-features", "indexmap", "log", - "naga 22.0.0", + "naga 23.0.0", "once_cell", "parking_lot", "profiling", @@ -6584,8 +6584,8 @@ dependencies = [ "rustc-hash", "smallvec", "thiserror", - "wgpu-hal 22.0.0", - "wgpu-types 22.0.0", + "wgpu-hal 23.0.0", + "wgpu-types 23.0.0", ] [[package]] @@ -6602,8 +6602,8 @@ dependencies = [ "block", "cfg_aliases 0.1.1", "core-graphics-types", - "d3d12 0.19.0", - "glow", + "d3d12", + "glow 0.13.1", "glutin_wgl_sys 0.5.0", "gpu-alloc", "gpu-allocator 0.25.0", @@ -6635,32 +6635,31 @@ 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", "ash 0.38.0+1.3.281", - "bit-set 0.6.0", + "bit-set 0.8.0", "bitflags 2.6.0", "block", + "bytemuck", "cfg_aliases 0.1.1", "core-graphics-types", - "d3d12 22.0.0", - "glow", + "glow 0.14.2", "glutin_wgl_sys 0.6.0", "gpu-alloc", - "gpu-allocator 0.26.0", + "gpu-allocator 0.27.0", "gpu-descriptor 0.3.0", - "hassle-rs", "js-sys", "khronos-egl", "libc", "libloading 0.8.4", "log", "metal 0.29.0", - "naga 22.0.0", + "naga 23.0.0", "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", @@ -6674,8 +6673,9 @@ dependencies = [ "thiserror", "wasm-bindgen", "web-sys", - "wgpu-types 22.0.0", - "winapi", + "wgpu-types 23.0.0", + "windows 0.58.0", + "windows-core 0.58.0", ] [[package]] @@ -6702,9 +6702,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", @@ -6778,6 +6778,16 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -6793,7 +6803,7 @@ version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ - "windows-result", + "windows-result 0.1.2", "windows-targets 0.52.6", ] @@ -6803,9 +6813,22 @@ version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", + "windows-implement 0.57.0", + "windows-interface 0.57.0", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement 0.58.0", + "windows-interface 0.58.0", + "windows-result 0.2.0", + "windows-strings", "windows-targets 0.52.6", ] @@ -6820,6 +6843,17 @@ dependencies = [ "syn 2.0.77", ] +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "windows-interface" version = "0.57.0" @@ -6831,6 +6865,17 @@ dependencies = [ "syn 2.0.77", ] +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "windows-result" version = "0.1.2" @@ -6840,6 +6885,25 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result 0.2.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.45.0" diff --git a/Cargo.toml b/Cargo.toml index 7f71181be..54bb55540 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -139,7 +139,7 @@ snapbox = "0.6.10" # keep in sync with `trycmd` strum = { version = "0.26.1", default-features = false, features = ["derive"] } sync_wrapper = { version = "1.0.0", default-features = false } tempfile = { version = "3.3.0", default-features = false } -thiserror = { version = "1.0.62", default-features = false } +thiserror = { version = "1.0.65", default-features = false } time = { version = "0.3.36", default-features = false } # Tokio is used for async test-running and for certain binaries. # The library crates do not require Tokio. @@ -147,9 +147,9 @@ tokio = { version = "1.28.0", default-features = false } trycmd = "0.15.4" # keep in sync with `snapbox` unicode-segmentation = { version = "1.10.1", default-features = false } unicode-width = { version = "0.2", default-features = false } -wasm-bindgen-futures = { version = "0.4.42", default-features = false } +wasm-bindgen-futures = { version = "0.4.45", default-features = false } web-time = { version = "1.1.0", default-features = false } -wgpu = { version = "22.1.0", default-features = false, features = ["wgsl"] } +wgpu = { version = "23.0.0", default-features = false, features = ["wgsl"] } yield-progress = { version = "0.1.6", default-features = false } # Note: Lints are also necessarily redefined in the workspaces other than this one. diff --git a/all-is-cubes-desktop/src/winit.rs b/all-is-cubes-desktop/src/winit.rs index 2b8eca8cf..b8d256a49 100644 --- a/all-is-cubes-desktop/src/winit.rs +++ b/all-is-cubes-desktop/src/winit.rs @@ -164,7 +164,6 @@ pub fn winit_main_loop_and_init( } /// Creates a [`DesktopSession`] that can be run in an [`winit`] event loop. -#[expect(clippy::large_stack_frames)] pub async fn create_winit_wgpu_desktop_session( executor: Arc, session: Session, diff --git a/all-is-cubes-gpu/Cargo.toml b/all-is-cubes-gpu/Cargo.toml index e4e26e103..2d44ffea5 100644 --- a/all-is-cubes-gpu/Cargo.toml +++ b/all-is-cubes-gpu/Cargo.toml @@ -78,7 +78,7 @@ resource = "0.5.0" send_wrapper = { workspace = true, features = ["futures"] } wasm-bindgen-futures = { workspace = true } # For initializing tests on web. (This is not a dev-dependency because some of said tests are not in this package.) -web-sys = { version = "0.3.69", features = ["OffscreenCanvas"] } +web-sys = { version = "0.3.72", features = ["OffscreenCanvas"] } web-time = { workspace = true } wgpu = { workspace = true, optional = true } diff --git a/all-is-cubes-gpu/src/in_wgpu/bloom.rs b/all-is-cubes-gpu/src/in_wgpu/bloom.rs index 898ee35af..fcb5a8b8f 100644 --- a/all-is-cubes-gpu/src/in_wgpu/bloom.rs +++ b/all-is-cubes-gpu/src/in_wgpu/bloom.rs @@ -62,13 +62,13 @@ impl BloomPipelines { layout: Some(&pipeline_layout), vertex: wgpu::VertexState { module: shaders.bloom.get(), - entry_point: "bloom_vertex", + entry_point: Some("bloom_vertex"), compilation_options: wgpu::PipelineCompilationOptions::default(), buffers: &[], }, fragment: Some(wgpu::FragmentState { module: shaders.bloom.get(), - entry_point: "bloom_downsample_fragment", + entry_point: Some("bloom_downsample_fragment"), compilation_options: wgpu::PipelineCompilationOptions::default(), targets: &[Some(wgpu::ColorTargetState { format: linear_scene_texture_format, @@ -88,13 +88,13 @@ impl BloomPipelines { layout: Some(&pipeline_layout), vertex: wgpu::VertexState { module: shaders.bloom.get(), - entry_point: "bloom_vertex", + entry_point: Some("bloom_vertex"), compilation_options: wgpu::PipelineCompilationOptions::default(), buffers: &[], }, fragment: Some(wgpu::FragmentState { module: shaders.bloom.get(), - entry_point: "bloom_upsample_fragment", + entry_point: Some("bloom_upsample_fragment"), compilation_options: wgpu::PipelineCompilationOptions::default(), targets: &[Some(wgpu::ColorTargetState { format: linear_scene_texture_format, diff --git a/all-is-cubes-gpu/src/in_wgpu/pipelines.rs b/all-is-cubes-gpu/src/in_wgpu/pipelines.rs index 5b5b12334..b89bed473 100644 --- a/all-is-cubes-gpu/src/in_wgpu/pipelines.rs +++ b/all-is-cubes-gpu/src/in_wgpu/pipelines.rs @@ -186,13 +186,13 @@ impl Pipelines { layout: Some(&block_render_pipeline_layout), vertex: wgpu::VertexState { module: shaders.blocks_and_lines.get(), - entry_point: "block_vertex_main", + entry_point: Some("block_vertex_main"), compilation_options: wgpu::PipelineCompilationOptions::default(), buffers: vertex_buffers, }, fragment: Some(wgpu::FragmentState { module: shaders.blocks_and_lines.get(), - entry_point: "block_fragment_opaque", + entry_point: Some("block_fragment_opaque"), compilation_options: wgpu::PipelineCompilationOptions::default(), targets: &[Some(wgpu::ColorTargetState { format: fb.linear_scene_texture_format(), @@ -219,19 +219,19 @@ impl Pipelines { layout: Some(&block_render_pipeline_layout), vertex: wgpu::VertexState { module: shaders.blocks_and_lines.get(), - entry_point: "block_vertex_main", + entry_point: Some("block_vertex_main"), compilation_options: wgpu::PipelineCompilationOptions::default(), buffers: vertex_buffers, }, fragment: Some(wgpu::FragmentState { module: shaders.blocks_and_lines.get(), - entry_point: match current_graphics_options.transparency { + entry_point: Some(match current_graphics_options.transparency { TransparencyOption::Volumetric => "block_fragment_transparent_volumetric", TransparencyOption::Surface | TransparencyOption::Threshold(_) => { "block_fragment_transparent_surface" } ref t => panic!("unimplemented transparency option {t:?}"), - }, + }), compilation_options: wgpu::PipelineCompilationOptions::default(), targets: &[Some(wgpu::ColorTargetState { format: fb.linear_scene_texture_format(), @@ -274,13 +274,13 @@ impl Pipelines { // uses the skybox texture too. vertex: wgpu::VertexState { module: shaders.blocks_and_lines.get(), - entry_point: "skybox_vertex", + entry_point: Some("skybox_vertex"), compilation_options: wgpu::PipelineCompilationOptions::default(), buffers: &[], }, fragment: Some(wgpu::FragmentState { module: shaders.blocks_and_lines.get(), - entry_point: "skybox_fragment", + entry_point: Some("skybox_fragment"), compilation_options: wgpu::PipelineCompilationOptions::default(), targets: &[Some(wgpu::ColorTargetState { format: fb.linear_scene_texture_format(), @@ -315,13 +315,13 @@ impl Pipelines { layout: Some(&lines_render_pipeline_layout), vertex: wgpu::VertexState { module: shaders.blocks_and_lines.get(), - entry_point: "lines_vertex", + entry_point: Some("lines_vertex"), compilation_options: wgpu::PipelineCompilationOptions::default(), buffers: &[WgpuLinesVertex::desc()], }, fragment: Some(wgpu::FragmentState { module: shaders.blocks_and_lines.get(), - entry_point: "lines_fragment", + entry_point: Some("lines_fragment"), compilation_options: wgpu::PipelineCompilationOptions::default(), targets: &[Some(wgpu::ColorTargetState { format: fb.linear_scene_texture_format(), @@ -378,13 +378,13 @@ impl Pipelines { ), vertex: wgpu::VertexState { module: shaders.frame_copy.get(), - entry_point: "frame_copy_vertex", + entry_point: Some("frame_copy_vertex"), compilation_options: wgpu::PipelineCompilationOptions::default(), buffers: &[], }, fragment: Some(wgpu::FragmentState { module: shaders.frame_copy.get(), - entry_point: "frame_copy_fragment", + entry_point: Some("frame_copy_fragment"), compilation_options: wgpu::PipelineCompilationOptions::default(), targets: &[Some(wgpu::ColorTargetState { format: wgpu::TextureFormat::Rgba16Float, @@ -459,13 +459,13 @@ impl Pipelines { ), vertex: wgpu::VertexState { module: shaders.rerun_copy.get(), - entry_point: "rerun_frame_copy_vertex", + entry_point: Some("rerun_frame_copy_vertex"), compilation_options: wgpu::PipelineCompilationOptions::default(), buffers: &[], }, fragment: Some(wgpu::FragmentState { module: shaders.rerun_copy.get(), - entry_point: "rerun_frame_copy_fragment", + entry_point: Some("rerun_frame_copy_fragment"), compilation_options: wgpu::PipelineCompilationOptions::default(), targets: &[ Some(wgpu::ColorTargetState { diff --git a/all-is-cubes-gpu/src/in_wgpu/postprocess.rs b/all-is-cubes-gpu/src/in_wgpu/postprocess.rs index 545b416fb..02e7f9fce 100644 --- a/all-is-cubes-gpu/src/in_wgpu/postprocess.rs +++ b/all-is-cubes-gpu/src/in_wgpu/postprocess.rs @@ -90,13 +90,13 @@ pub(crate) fn create_postprocess_pipeline( layout: Some(&pipeline_layout), vertex: wgpu::VertexState { module: shaders.postprocess.get(), - entry_point: "postprocess_vertex", + entry_point: Some("postprocess_vertex"), compilation_options: wgpu::PipelineCompilationOptions::default(), buffers: &[], }, fragment: Some(wgpu::FragmentState { module: shaders.postprocess.get(), - entry_point: "postprocess_fragment", + entry_point: Some("postprocess_fragment"), compilation_options: wgpu::PipelineCompilationOptions::default(), targets: &[Some(wgpu::ColorTargetState { format: super::surface_view_format(surface_format), @@ -194,7 +194,7 @@ pub(crate) fn postprocess( render_pass.set_pipeline(postprocess_render_pipeline); render_pass.set_bind_group( 0, - ev.postprocess_bind_group.get_or_insert( + &*ev.postprocess_bind_group.get_or_insert( ( ev.info_text_texture.view().unwrap().global_id(), ev.fb.global_id(), diff --git a/all-is-cubes-gpu/src/in_wgpu/rerun_image.rs b/all-is-cubes-gpu/src/in_wgpu/rerun_image.rs index 69b2ad100..a870ba9d3 100644 --- a/all-is-cubes-gpu/src/in_wgpu/rerun_image.rs +++ b/all-is-cubes-gpu/src/in_wgpu/rerun_image.rs @@ -83,13 +83,13 @@ impl RerunImageExport { let mut logged_camera = normal_camera.clone(); logged_camera.set_viewport(Viewport::with_scale(1.0, logged_size)); - let Resources { - camera_buffer, - srgb_color_texture, - srgb_color_texture_view, - linear_depth_texture, - linear_depth_texture_view, - copy_bind_group, + let &mut Resources { + ref camera_buffer, + ref srgb_color_texture, + ref srgb_color_texture_view, + ref linear_depth_texture, + ref linear_depth_texture_view, + ref copy_bind_group, } = self.resources.get_or_insert( (fb.scene_for_postprocessing_input().global_id(), logged_size), || { diff --git a/all-is-cubes-gpu/src/in_wgpu/shader_testing.rs b/all-is-cubes-gpu/src/in_wgpu/shader_testing.rs index 97d7e84ce..fe5956d0c 100644 --- a/all-is-cubes-gpu/src/in_wgpu/shader_testing.rs +++ b/all-is-cubes-gpu/src/in_wgpu/shader_testing.rs @@ -96,13 +96,13 @@ where layout: Some(&pipelines.block_render_pipeline_layout), vertex: wgpu::VertexState { module: &shader, - entry_point: "block_vertex_main", + entry_point: Some("block_vertex_main"), compilation_options: wgpu::PipelineCompilationOptions::default(), buffers: &[WgpuBlockVertex::desc(), WgpuInstanceData::desc()], }, fragment: Some(wgpu::FragmentState { module: &shader, - entry_point: "test_entry_point", + entry_point: Some("test_entry_point"), compilation_options: wgpu::PipelineCompilationOptions::default(), targets: &[Some(wgpu::ColorTargetState { format: fbt.linear_scene_texture_format(), diff --git a/all-is-cubes-wasm/Cargo.lock b/all-is-cubes-wasm/Cargo.lock index 7ac809776..1def8506b 100644 --- a/all-is-cubes-wasm/Cargo.lock +++ b/all-is-cubes-wasm/Cargo.lock @@ -306,18 +306,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" @@ -390,6 +390,15 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" +[[package]] +name = "cc" +version = "1.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" +dependencies = [ + "shlex", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -412,37 +421,6 @@ dependencies = [ "unicode-width", ] -[[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 = "console_error_panic_hook" version = "0.1.7" @@ -789,9 +767,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", @@ -851,19 +829,6 @@ dependencies = [ "bitflags 2.6.0", ] -[[package]] -name = "gpu-allocator" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" -dependencies = [ - "log", - "presser", - "thiserror", - "winapi", - "windows", -] - [[package]] name = "gpu-descriptor" version = "0.3.0" @@ -905,21 +870,6 @@ dependencies = [ "allocator-api2", ] -[[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 = "heck" version = "0.5.0" @@ -995,9 +945,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -1127,6 +1077,16 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c8dda44ff03a2f238717214da50f65d5a53b45cd213a7370424ffdb6fae815" +[[package]] +name = "minicov" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "def6d99771d7c499c26ad4d40eb6645eafd3a1553b35fc26ea5a489a45e82d9a" +dependencies = [ + "cc", + "walkdir", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -1176,9 +1136,9 @@ checksum = "bc0287524726960e07b119cebd01678f852f147742ae0d925e6a520dca956126" [[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", @@ -1266,9 +1226,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "ordered-float" @@ -1380,12 +1340,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "presser" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" - [[package]] name = "proc-macro2" version = "1.0.86" @@ -1517,6 +1471,15 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "scoped-tls" version = "1.0.1" @@ -1570,6 +1533,12 @@ dependencies = [ "serde", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "simd-adler32" version = "0.3.7" @@ -1701,18 +1670,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", @@ -1739,9 +1708,9 @@ checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "version_check" @@ -1749,6 +1718,16 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -1757,19 +1736,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", @@ -1782,9 +1762,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -1794,9 +1774,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1804,9 +1784,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", @@ -1817,18 +1797,19 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-bindgen-test" -version = "0.3.42" +version = "0.3.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b" +checksum = "d381749acb0943d357dcbd8f0b100640679883fcdeeef04def49daf8d33a5426" dependencies = [ "console_error_panic_hook", "js-sys", + "minicov", "scoped-tls", "wasm-bindgen", "wasm-bindgen-futures", @@ -1837,9 +1818,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.42" +version = "0.3.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" +checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0" dependencies = [ "proc-macro2", "quote", @@ -1848,9 +1829,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -1868,9 +1849,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", @@ -1893,9 +1874,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", @@ -1918,22 +1899,21 @@ 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", "ash", "bitflags 2.6.0", + "bytemuck", "cfg_aliases", "core-graphics-types", "glow", "glutin_wgl_sys", "gpu-alloc", - "gpu-allocator", "gpu-descriptor", - "hassle-rs", "js-sys", "khronos-egl", "libc", @@ -1954,14 +1934,14 @@ dependencies = [ "wasm-bindgen", "web-sys", "wgpu-types", - "winapi", + "windows", ] [[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", @@ -1969,58 +1949,75 @@ dependencies = [ ] [[package]] -name = "widestring" -version = "1.1.0" +name = "winapi-util" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +dependencies = [ + "windows-sys", +] [[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", ] [[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", +] [[package]] -name = "winapi-util" -version = "0.1.8" +name = "windows-implement" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ - "windows-sys", + "proc-macro2", + "quote", + "syn 2.0.77", ] [[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 2.0.77", +] [[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", ] [[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", ] diff --git a/all-is-cubes-wasm/Cargo.toml b/all-is-cubes-wasm/Cargo.toml index 809d5dbf4..b90190016 100644 --- a/all-is-cubes-wasm/Cargo.toml +++ b/all-is-cubes-wasm/Cargo.toml @@ -43,20 +43,20 @@ futures-core = { version = "0.3.31", default-features = false, features = ["allo # Feature enabling for indirect dependency all-is-cubes → rand → getrandom, # as well as our direct dependency getrandom = { version = "0.2.7", features = ["js"] } -js-sys = "0.3.69" +js-sys = "0.3.72" log = { version = "0.4.17", default-features = false } rand = { version = "0.8.3", default-features = false, features = ["std", "std_rng"] } send_wrapper = { version = "0.6.0", default-features = false } -wasm-bindgen = "0.2.92" -wasm-bindgen-futures = "0.4.42" +wasm-bindgen = "0.2.95" +wasm-bindgen-futures = "0.4.45" web-time = { version = "1.1.0" } # Must be the same version as in the main workspace, i.e. as in all-is-cubes-gpu. -wgpu = { version = "22.1.0", default-features = false, features = ["webgpu", "webgl"] } +wgpu = { version = "23.0.0", default-features = false, features = ["webgpu", "webgl"] } # Feature enabling yield-progress = { version = "0.1.6", features = ["log_hiccups"] } [dependencies.web-sys] -version = "0.3.69" +version = "0.3.72" features = [ "console", "AddEventListenerOptions", @@ -82,7 +82,7 @@ features = [ ] [dev-dependencies] -wasm-bindgen-test = "0.3" +wasm-bindgen-test = "0.3.45" [lints.rust] # rustc lints that are set to deny