diff --git a/Cargo.lock b/Cargo.lock index 0e78aa6..2169c93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -780,12 +780,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - [[package]] name = "cfg_aliases" version = "0.2.1" @@ -1314,7 +1308,7 @@ dependencies = [ "ahash", "bytemuck", "egui", - "glow 0.16.0", + "glow", "log", "memoffset", "profiling", @@ -1776,18 +1770,6 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94" -[[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 = "glow" version = "0.16.0" @@ -1807,7 +1789,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec69412a0bf07ea7607e638b415447857a808846c2b685a43c8aa18bc6d5e499" dependencies = [ "bitflags 2.6.0", - "cfg_aliases 0.2.1", + "cfg_aliases", "cgl", "core-foundation", "dispatch", @@ -1831,7 +1813,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85edca7075f8fc728f28cb8fbb111a96c3b89e930574369e3e9c27eb75d3788f" dependencies = [ - "cfg_aliases 0.2.1", + "cfg_aliases", "glutin", "raw-window-handle", "winit", @@ -2438,9 +2420,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" +checksum = "9c3572083504c43e14aec05447f8a3d57cce0f66d7a3c1b9058572eca4d70ab9" dependencies = [ "bitflags 2.6.0", "block", @@ -2484,14 +2466,13 @@ dependencies = [ [[package]] name = "naga" -version = "23.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "364f94bc34f61332abebe8cad6f6cd82a5b65cff22c828d05d0968911462ca4f" +version = "23.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=b92e624358164590e8efc8fb4e784d031ac3ef5e#b92e624358164590e8efc8fb4e784d031ac3ef5e" dependencies = [ "arrayvec", "bit-set", "bitflags 2.6.0", - "cfg_aliases 0.1.1", + "cfg_aliases", "codespan-reporting", "hexf-parse", "indexmap", @@ -2550,7 +2531,7 @@ checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags 2.6.0", "cfg-if", - "cfg_aliases 0.2.1", + "cfg_aliases", "libc", "memoffset", ] @@ -4243,7 +4224,7 @@ version = "0.6.0-alpha.0" dependencies = [ "anyhow", "bytemuck", - "cfg_aliases 0.2.1", + "cfg_aliases", "cgmath", "criterion", "eframe", @@ -4501,11 +4482,10 @@ dependencies = [ [[package]] name = "wgpu" version = "23.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80f70000db37c469ea9d67defdc13024ddf9a5f1b89cb2941b812ad7cde1735a" +source = "git+https://github.com/gfx-rs/wgpu?rev=b92e624358164590e8efc8fb4e784d031ac3ef5e#b92e624358164590e8efc8fb4e784d031ac3ef5e" dependencies = [ "arrayvec", - "cfg_aliases 0.1.1", + "cfg_aliases", "document-features", "js-sys", "log", @@ -4526,13 +4506,12 @@ dependencies = [ [[package]] name = "wgpu-core" version = "23.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63c3c478de8e7e01786479919c8769f62a22eec16788d8c2ac77ce2c132778a" +source = "git+https://github.com/gfx-rs/wgpu?rev=b92e624358164590e8efc8fb4e784d031ac3ef5e#b92e624358164590e8efc8fb4e784d031ac3ef5e" dependencies = [ "arrayvec", "bit-vec", "bitflags 2.6.0", - "cfg_aliases 0.1.1", + "cfg_aliases", "document-features", "indexmap", "log", @@ -4551,8 +4530,7 @@ dependencies = [ [[package]] name = "wgpu-hal" version = "23.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89364b8a0b211adc7b16aeaf1bd5ad4a919c1154b44c9ce27838213ba05fd821" +source = "git+https://github.com/gfx-rs/wgpu?rev=b92e624358164590e8efc8fb4e784d031ac3ef5e#b92e624358164590e8efc8fb4e784d031ac3ef5e" dependencies = [ "android_system_properties", "arrayvec", @@ -4560,9 +4538,9 @@ dependencies = [ "bitflags 2.6.0", "block", "bytemuck", - "cfg_aliases 0.1.1", + "cfg_aliases", "core-graphics-types", - "glow 0.14.2", + "glow", "glutin_wgl_sys", "gpu-alloc", "gpu-descriptor", @@ -4592,8 +4570,7 @@ dependencies = [ [[package]] name = "wgpu-types" version = "23.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "610f6ff27778148c31093f3b03abc4840f9636d58d597ca2f5977433acfe0068" +source = "git+https://github.com/gfx-rs/wgpu?rev=b92e624358164590e8efc8fb4e784d031ac3ef5e#b92e624358164590e8efc8fb4e784d031ac3ef5e" dependencies = [ "bitflags 2.6.0", "js-sys", @@ -4982,7 +4959,7 @@ dependencies = [ "block2", "bytemuck", "calloop", - "cfg_aliases 0.2.1", + "cfg_aliases", "concurrent-queue", "core-foundation", "core-graphics", diff --git a/Cargo.toml b/Cargo.toml index f5f4a1f..9a0ce25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -110,3 +110,4 @@ lto = "thin" [patch.crates-io] # geo = { path = "../geo/geo" } +wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "b92e624358164590e8efc8fb4e784d031ac3ef5e" }