From e299bd83c8d165562cabb1a1bc9f8b5e73ac6897 Mon Sep 17 00:00:00 2001 From: Kevin Reid Date: Tue, 3 Sep 2024 16:00:13 -0700 Subject: [PATCH] [next/wgpu] Patch `wgpu` (and `rerun`) to git version. We need to patch `rerun` to avoid pinned dependency version conflicts. --- Cargo.lock | 456 +++++++++++++++++--------------- Cargo.toml | 16 +- all-is-cubes-base/Cargo.toml | 4 +- all-is-cubes-desktop/Cargo.toml | 2 +- all-is-cubes-wasm/Cargo.lock | 259 +++++++++--------- all-is-cubes-wasm/Cargo.toml | 6 +- 6 files changed, 389 insertions(+), 354 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d9cce2f7c..b419a1891 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -171,7 +171,7 @@ dependencies = [ "tokio", "trycmd", "unicode-width", - "wgpu 22.1.0", + "wgpu 22.0.0", "winit", "yield-progress", ] @@ -206,8 +206,8 @@ dependencies = [ "tokio", "wasm-bindgen-futures", "web-sys", - "web-time 1.1.0", - "wgpu 22.1.0", + "web-time", + "wgpu 22.0.0", ] [[package]] @@ -562,9 +562,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", @@ -618,9 +618,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock 3.4.0", "cfg-if", @@ -632,7 +632,7 @@ dependencies = [ "rustix 0.38.34", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -661,7 +661,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" dependencies = [ - "async-io 2.3.3", + "async-io 2.3.4", "blocking", "futures-lite 2.3.0", ] @@ -691,16 +691,16 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] name = "async-signal" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", "atomic-waker", "cfg-if", @@ -709,7 +709,7 @@ dependencies = [ "rustix 0.38.34", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -726,7 +726,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -758,7 +758,7 @@ checksum = "edf3ee19dbc0a46d740f6f0926bde8c50f02bdbc7b536842da28f6ac56513a8b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -887,7 +887,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -901,11 +901,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]] @@ -916,9 +916,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" @@ -1024,7 +1024,7 @@ checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -1055,9 +1055,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.7" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] @@ -1273,7 +1273,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -1688,17 +1688,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" @@ -1733,7 +1722,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -1808,7 +1797,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -1941,7 +1930,7 @@ checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -1968,7 +1957,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -2082,7 +2071,7 @@ dependencies = [ "itertools 0.10.5", "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -2211,7 +2200,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -2325,7 +2314,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -2491,6 +2480,18 @@ dependencies = [ "web-sys", ] +[[package]] +name = "glow" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f865cbd94bd355b89611211e49508da98a1fce0ad755c1e8448fb96711b24528" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gltf" version = "1.4.1" @@ -2515,7 +2516,7 @@ dependencies = [ "inflections", "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -2582,15 +2583,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.58.0", ] [[package]] @@ -2973,7 +2973,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b23a0c8dfe501baac4adf6ebbfa6eddf8f0c07f56b058cc1288017e32397846c" dependencies = [ "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -3095,9 +3095,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -3330,9 +3330,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "matrixmultiply" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" dependencies = [ "autocfg", "rawpointer", @@ -3519,11 +3519,10 @@ dependencies = [ [[package]] name = "naga" version = "22.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09eeccb9b50f4f7839b214aa3e08be467159506a986c18e0702170ccf720a453" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#ee35b0e5866795d3fdd8307b1fa67018cf5cdd09" dependencies = [ "arrayvec", - "bit-set 0.6.0", + "bit-set 0.8.0", "bitflags 2.6.0", "cfg_aliases 0.1.1", "codespan-reporting", @@ -3719,7 +3718,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -3789,7 +3788,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -4239,7 +4238,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -4280,7 +4279,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -4297,9 +4296,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", "fastrand 2.1.0", @@ -4468,12 +4467,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -4529,9 +4528,9 @@ dependencies = [ [[package]] name = "puffin_http" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4936c085e48efc86f6d96609dc5086d1d236afe3ec4676f09b157a4f4be83ff6" +checksum = "739a3c7f56604713b553d7addd7718c226e88d598979ae3450320800bd0e9810" dependencies = [ "anyhow", "crossbeam-channel", @@ -4683,9 +4682,9 @@ dependencies = [ [[package]] name = "re_arrow2" -version = "0.17.4" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1285f33f03e2faf9f77b06c19f32f8c54792a4cbb19df762b9ea70b79e0773d" +checksum = "55322c12f50d5a372e8c8b9bf672894e8280772dc62af3a44188c98556363404" dependencies = [ "ahash", "arrow-format", @@ -4706,18 +4705,16 @@ dependencies = [ [[package]] name = "re_build_info" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a98c29541521919bee08e6bb13d287c714f6995321f9d740e5c187c6ad868413" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "serde", ] [[package]] name = "re_build_tools" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866f3f2bf7c0e7dce6523a67b37cdfa5d55d2677a3812a09bf6bdc65b6627794" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "anyhow", "cargo_metadata 0.18.1", @@ -4730,18 +4727,16 @@ dependencies = [ [[package]] name = "re_case" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30db5f2efd457dffcc7f3ea2303f34e94ec2cc65f352c1230784b872b8486e0" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "convert_case", ] [[package]] name = "re_chunk" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e45b643407694a16d9d9f81fc518cfeb8edab68382e94f39adf520c9625e3f09" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "ahash", "anyhow", @@ -4766,24 +4761,21 @@ dependencies = [ [[package]] name = "re_error" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e946ff11b1b6a7dc2936545d19ccaada4e136eb2c1bfe3e256685e62fe66b1b7" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" [[package]] name = "re_format" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a9aefca01481633d088efe6eeedc8ff058b1193fdb317c2e8355d12a377c" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "num-traits", ] [[package]] name = "re_format_arrow" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa78197b2c101120de22642b2ad7a8009cc7829ee10f179e6cbcdd9afc7422c5" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "comfy-table", "re_arrow2", @@ -4793,9 +4785,8 @@ dependencies = [ [[package]] name = "re_log" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015bb88d139aa3ad4a221b0d1677b93fa70719b8c067efa3ef3cb2fb37d1e82e" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "env_logger", "js-sys", @@ -4808,9 +4799,8 @@ dependencies = [ [[package]] name = "re_log_encoding" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0570dee318c67b686d93c7480eb9d9f35f8dc3c29159afb1762a7162085e7a4" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "lz4_flex", "parking_lot", @@ -4826,9 +4816,8 @@ dependencies = [ [[package]] name = "re_log_types" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a1cc8d28535c6a37fd6d21b8163ac56d07131a9c5710c9e59232076cd6f08b" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "ahash", "anyhow", @@ -4860,14 +4849,13 @@ dependencies = [ "time", "typenum", "uuid", - "web-time 0.2.4", + "web-time", ] [[package]] name = "re_memory" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f417adf832671fbb5e814668f4e02ad36331a6dbe2061f6aa3d38ea2d707699" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "ahash", "backtrace", @@ -4883,14 +4871,13 @@ dependencies = [ "smallvec", "sysinfo", "wasm-bindgen", - "web-time 0.2.4", + "web-time", ] [[package]] name = "re_sdk" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "407ce66256e026f47d1c98889ea9f59601386751f8f790ce237edc4860188612" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "ahash", "crossbeam", @@ -4914,9 +4901,8 @@ dependencies = [ [[package]] name = "re_sdk_comms" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52191155ad2ba58e37a21856e62ed169d4c39f047f243bfbe83b561317fae3a2" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "ahash", "crossbeam", @@ -4931,22 +4917,20 @@ dependencies = [ [[package]] name = "re_smart_channel" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1b219ae7751d2ecac7fd8f7e78b736cb80fbf43e3f612dcce3d2ee4db0e242c" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "crossbeam", "parking_lot", "re_tracing", "serde", - "web-time 0.2.4", + "web-time", ] [[package]] name = "re_string_interner" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfbd1c4501483975843472682ca12451485c3f604e832c9217f0b41f8cad32b" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "ahash", "nohash-hasher", @@ -4958,9 +4942,8 @@ dependencies = [ [[package]] name = "re_tracing" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f42f2b5f1994234a4c9114ae365b6cfa0d6ae085fb47ee5b380c79e4c773402f" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "puffin", "puffin_http", @@ -4970,22 +4953,20 @@ dependencies = [ [[package]] name = "re_tuid" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "924a90e25ebaeed606b0451519211a267f294ab97dd4e7da3c7780150c23167c" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "document-features", "getrandom", "once_cell", "serde", - "web-time 0.2.4", + "web-time", ] [[package]] name = "re_types" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ff7891941d1bef71c20dfd16ebb780d4ec33bdbbcbbe080704de076348d426" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "anyhow", "array-init", @@ -5017,9 +4998,8 @@ dependencies = [ [[package]] name = "re_types_builder" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0ee76a5cb6d2d4c83c38bf8fc8f58a03726f15e80f9493f646f8b8ac28abdf" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "anyhow", "camino", @@ -5038,7 +5018,7 @@ dependencies = [ "re_log", "re_tracing", "rust-format", - "syn 2.0.69", + "syn 2.0.77", "tempfile", "unindent", "xshell 0.2.6", @@ -5046,9 +5026,8 @@ dependencies = [ [[package]] name = "re_types_core" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac12d2b9a1421cda3c1c68a33de7f394e73b96af09ea3c5a5520709fa358b003" +version = "0.19.0-alpha.1+dev" +source = "git+https://github.com/rerun-io/rerun/?rev=fed60d43ff22eeac8f0822cfae35d4ee5126d6f0#fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" dependencies = [ "anyhow", "backtrace", @@ -5367,7 +5346,7 @@ dependencies = [ "quote", "rust-embed-utils", "shellexpand", - "syn 2.0.69", + "syn 2.0.77", "walkdir", ] @@ -5401,9 +5380,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver 1.0.23", ] @@ -5522,7 +5501,7 @@ checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -5554,7 +5533,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -5856,7 +5835,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -5872,9 +5851,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.69" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -5895,9 +5874,9 @@ checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "sysinfo" -version = "0.30.12" +version = "0.30.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae" +checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" dependencies = [ "cfg-if", "core-foundation-sys", @@ -5980,7 +5959,7 @@ dependencies = [ "tinytemplate", "tokio", "wgpu 0.19.4", - "wgpu 22.1.0", + "wgpu 22.0.0", ] [[package]] @@ -6000,7 +5979,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -6089,7 +6068,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -6222,7 +6201,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -6353,9 +6332,9 @@ checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" [[package]] name = "unindent" @@ -6452,34 +6431,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -6489,9 +6469,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6499,38 +6479,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -6573,9 +6543,8 @@ dependencies = [ [[package]] name = "wgpu" -version = "22.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#ee35b0e5866795d3fdd8307b1fa67018cf5cdd09" dependencies = [ "arrayvec", "cfg_aliases 0.1.1", @@ -6590,7 +6559,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core 22.1.0", + "wgpu-core 22.0.0", "wgpu-hal 22.0.0", "wgpu-types 22.0.0", ] @@ -6623,12 +6592,11 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "22.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#ee35b0e5866795d3fdd8307b1fa67018cf5cdd09" dependencies = [ "arrayvec", - "bit-vec 0.7.0", + "bit-vec 0.8.0", "bitflags 2.6.0", "cfg_aliases 0.1.1", "document-features", @@ -6660,8 +6628,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", @@ -6694,24 +6662,21 @@ dependencies = [ [[package]] name = "wgpu-hal" version = "22.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#ee35b0e5866795d3fdd8307b1fa67018cf5cdd09" 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", "cfg_aliases 0.1.1", "core-graphics-types", - "d3d12 22.0.0", - "glow", + "glow 0.14.0", "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", @@ -6733,7 +6698,8 @@ dependencies = [ "wasm-bindgen", "web-sys", "wgpu-types 22.0.0", - "winapi", + "windows 0.58.0", + "windows-core 0.58.0", ] [[package]] @@ -6761,8 +6727,7 @@ dependencies = [ [[package]] name = "wgpu-types" version = "22.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#ee35b0e5866795d3fdd8307b1fa67018cf5cdd09" dependencies = [ "bitflags 2.6.0", "js-sys", @@ -6836,6 +6801,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" @@ -6851,7 +6826,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", ] @@ -6861,9 +6836,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", ] @@ -6875,7 +6863,18 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "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]] @@ -6886,7 +6885,18 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "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]] @@ -6898,6 +6908,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" @@ -6925,6 +6954,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -7140,7 +7178,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "web-time 1.1.0", + "web-time", "windows-sys 0.52.0", "x11-dl", "x11rb", @@ -7218,12 +7256,12 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xdg-home" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -7306,7 +7344,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6a42dba597da5dc59841799b16dda7c254ad91a497aab4c594ba7a785eef688" dependencies = [ "log", - "web-time 1.1.0", + "web-time", ] [[package]] @@ -7392,7 +7430,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c0edd22ae..5ca0747c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -116,9 +116,9 @@ pretty_assertions = "1.2.0" rand = { version = "0.8.3", default-features = false } rand_xoshiro = "0.6.0" rayon = { version = "1.8.0" } -re_log_types = { version = "0.18.0", default-features = false } -re_sdk = { version = "0.18.0", default-features = false } -re_types = { version = "0.18.0", default-features = false } +re_log_types = { version = "0.19.0-alpha.1", default-features = false } +re_sdk = { version = "0.19.0-alpha.1", default-features = false } +re_types = { version = "0.19.0-alpha.1", default-features = false } rectangle-pack = "0.4.2" rendiff = { version = "0.2.0" } scopeguard = { version = "1.2.0", default-features = false } @@ -140,7 +140,7 @@ unicode-segmentation = { version = "1.10.1", default-features = false } unicode-width = { version = "0.1.13", default-features = false } wasm-bindgen-futures = "0.4.42" web-time = "1.0.0" -wgpu = { version = "22.1.0", default-features = false, features = ["wgsl"] } +wgpu = { version = "22.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. @@ -273,5 +273,9 @@ overflow-checks = true [patch.crates-io] # Here are some patches we might want to apply for development: -# -# wgpu = { git = "https://github.com/gfx-rs/wgpu/", branch = "trunk" } + +wgpu = { git = "https://github.com/gfx-rs/wgpu/", branch = "trunk" } + +re_log_types = { version = "0.19.0-alpha.1", git = "https://github.com/rerun-io/rerun/", rev = "fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" } +re_sdk = { version = "0.19.0-alpha.1", git = "https://github.com/rerun-io/rerun/", rev = "fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" } +re_types = { version = "0.19.0-alpha.1", git = "https://github.com/rerun-io/rerun/", rev = "fed60d43ff22eeac8f0822cfae35d4ee5126d6f0" } diff --git a/all-is-cubes-base/Cargo.toml b/all-is-cubes-base/Cargo.toml index 4c254a847..e3d5c44c9 100644 --- a/all-is-cubes-base/Cargo.toml +++ b/all-is-cubes-base/Cargo.toml @@ -22,7 +22,9 @@ arbitrary = [ "euclid/arbitrary", "ordered-float/arbitrary" ] -rerun = ["dep:re_types"] +rerun = [ + "dep:re_types" +] serde = [ "dep:serde", "ordered-float/serde", diff --git a/all-is-cubes-desktop/Cargo.toml b/all-is-cubes-desktop/Cargo.toml index 15540a7b5..7e048adba 100644 --- a/all-is-cubes-desktop/Cargo.toml +++ b/all-is-cubes-desktop/Cargo.toml @@ -47,7 +47,7 @@ terminal = ["dep:ratatui", "dep:unicode-width"] # Game audio output support. audio = ["dep:kira"] # Adds rerun logging support. Intended mainly for development of All is Cubes itself. -rerun = ["dep:re_sdk", "all-is-cubes/rerun", "all-is-cubes-gpu/rerun"] +rerun = ["all-is-cubes/rerun", "all-is-cubes-gpu/rerun"] # TODO: Define a feature with which to turn off windowing & GPU support. [dependencies] diff --git a/all-is-cubes-wasm/Cargo.lock b/all-is-cubes-wasm/Cargo.lock index 129224fe3..b7e2c1ef8 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.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" +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" @@ -795,9 +773,9 @@ dependencies = [ [[package]] name = "glow" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +checksum = "f865cbd94bd355b89611211e49508da98a1fce0ad755c1e8448fb96711b24528" dependencies = [ "js-sys", "slotmap", @@ -857,19 +835,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" @@ -911,21 +876,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" @@ -1019,9 +969,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -1151,6 +1101,16 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c8dda44ff03a2f238717214da50f65d5a53b45cd213a7370424ffdb6fae815" +[[package]] +name = "minicov" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169" +dependencies = [ + "cc", + "walkdir", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -1200,9 +1160,8 @@ checksum = "bc0287524726960e07b119cebd01678f852f147742ae0d925e6a520dca956126" [[package]] name = "naga" -version = "22.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#960555a426b0aae48ed36889b8c7feb48de19a6d" dependencies = [ "arrayvec", "bit-set", @@ -1420,12 +1379,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" @@ -1557,6 +1510,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" @@ -1610,6 +1572,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" @@ -1779,9 +1747,9 @@ checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" [[package]] name = "version_check" @@ -1789,6 +1757,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" @@ -1797,19 +1775,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", @@ -1822,9 +1801,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -1834,9 +1813,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1844,9 +1823,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", @@ -1857,18 +1836,19 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-bindgen-test" -version = "0.3.42" +version = "0.3.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b" +checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9" dependencies = [ "console_error_panic_hook", "js-sys", + "minicov", "scoped-tls", "wasm-bindgen", "wasm-bindgen-futures", @@ -1877,9 +1857,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.42" +version = "0.3.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" +checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021" dependencies = [ "proc-macro2", "quote", @@ -1888,9 +1868,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -1908,9 +1888,8 @@ dependencies = [ [[package]] name = "wgpu" -version = "22.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#960555a426b0aae48ed36889b8c7feb48de19a6d" dependencies = [ "arrayvec", "cfg_aliases", @@ -1933,9 +1912,8 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "22.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#960555a426b0aae48ed36889b8c7feb48de19a6d" dependencies = [ "arrayvec", "bit-vec", @@ -1959,8 +1937,7 @@ dependencies = [ [[package]] name = "wgpu-hal" version = "22.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#960555a426b0aae48ed36889b8c7feb48de19a6d" dependencies = [ "android_system_properties", "arrayvec", @@ -1971,9 +1948,7 @@ dependencies = [ "glow", "glutin_wgl_sys", "gpu-alloc", - "gpu-allocator", "gpu-descriptor", - "hassle-rs", "js-sys", "khronos-egl", "libc", @@ -1994,14 +1969,13 @@ dependencies = [ "wasm-bindgen", "web-sys", "wgpu-types", - "winapi", + "windows", ] [[package]] name = "wgpu-types" version = "22.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#960555a426b0aae48ed36889b8c7feb48de19a6d" dependencies = [ "bitflags 2.6.0", "js-sys", @@ -2009,58 +1983,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.69", ] [[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.69", +] [[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 a51ad96b3..fdc3fb1ad 100644 --- a/all-is-cubes-wasm/Cargo.toml +++ b/all-is-cubes-wasm/Cargo.toml @@ -49,7 +49,7 @@ wasm-bindgen = "0.2.92" wasm-bindgen-futures = "0.4.42" web-time = { version = "1.0.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 = "22.0.0", default-features = false, features = ["webgpu", "webgl"] } # Feature enabling yield-progress = { version = "0.1.6", features = ["log_hiccups"] } @@ -208,5 +208,5 @@ overflow-checks = true [patch.crates-io] # Here are some patches we might want to apply for development: -# -# wgpu = { git = "https://github.com/gfx-rs/wgpu/", branch = "trunk" } + +wgpu = { git = "https://github.com/gfx-rs/wgpu/", branch = "trunk" }