diff --git a/Cargo.lock b/Cargo.lock index 4f5a492585a2..2fee2c5f7171 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1361,7 +1361,7 @@ dependencies = [ "thiserror 1.0.69", "type-map", "web-time", - "wgpu", + "wgpu 26.0.1", "winit", ] @@ -1818,6 +1818,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + [[package]] name = "fontconfig" version = "0.10.0" @@ -2321,7 +2327,16 @@ checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" dependencies = [ "allocator-api2", "equivalent", - "foldhash", + "foldhash 0.1.5", +] + +[[package]] +name = "hashbrown" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +dependencies = [ + "foldhash 0.2.0", ] [[package]] @@ -2548,7 +2563,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" dependencies = [ "equivalent", - "hashbrown 0.15.3", + "hashbrown 0.16.1", ] [[package]] @@ -3152,13 +3167,39 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "naga" +version = "27.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "066cf25f0e8b11ee0df221219010f213ad429855f57c494f995590c861a9a7d8" +dependencies = [ + "arrayvec", + "bit-set", + "bitflags 2.10.0", + "cfg-if", + "cfg_aliases", + "codespan-reporting", + "half", + "hashbrown 0.16.1", + "hexf-parse", + "indexmap", + "libm", + "log", + "num-traits", + "once_cell", + "rustc-hash 1.1.0", + "spirv", + "thiserror 2.0.17", + "unicode-ident", +] + [[package]] name = "naga-agal" version = "0.1.0" dependencies = [ "bitflags 2.10.0", "insta", - "naga", + "naga 27.0.3", "num-derive", "num-traits", ] @@ -3168,7 +3209,7 @@ name = "naga-pixelbender" version = "0.1.0" dependencies = [ "anyhow", - "naga", + "naga 27.0.3", "ruffle_render", ] @@ -4143,7 +4184,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -4540,7 +4581,7 @@ dependencies = [ "vergen", "walkdir", "webbrowser", - "wgpu", + "wgpu 27.0.1", "windows-sys 0.61.2", "winit", ] @@ -4624,7 +4665,7 @@ dependencies = [ "thiserror 2.0.17", "tracing", "wasm-bindgen", - "wgpu", + "wgpu 27.0.1", ] [[package]] @@ -4667,7 +4708,7 @@ dependencies = [ "image", "indexmap", "lru", - "naga", + "naga 27.0.3", "naga-agal", "naga-pixelbender", "profiling", @@ -4676,7 +4717,7 @@ dependencies = [ "swf", "tracing", "web-sys", - "wgpu", + "wgpu 27.0.1", ] [[package]] @@ -6429,7 +6470,7 @@ dependencies = [ "hashbrown 0.15.3", "js-sys", "log", - "naga", + "naga 26.0.0", "parking_lot", "portable-atomic", "profiling", @@ -6439,9 +6480,38 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", + "wgpu-core 26.0.1", + "wgpu-hal 26.0.6", + "wgpu-types 26.0.0", +] + +[[package]] +name = "wgpu" +version = "27.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe68bac7cde125de7a731c3400723cadaaf1703795ad3f4805f187459cd7a77" +dependencies = [ + "arrayvec", + "bitflags 2.10.0", + "cfg-if", + "cfg_aliases", + "document-features", + "hashbrown 0.16.1", + "js-sys", + "log", + "naga 27.0.3", + "parking_lot", + "portable-atomic", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core 27.0.3", + "wgpu-hal 27.0.4", + "wgpu-types 27.0.1", ] [[package]] @@ -6459,7 +6529,39 @@ dependencies = [ "hashbrown 0.15.3", "indexmap", "log", - "naga", + "naga 26.0.0", + "once_cell", + "parking_lot", + "portable-atomic", + "profiling", + "raw-window-handle", + "rustc-hash 1.1.0", + "smallvec", + "thiserror 2.0.17", + "wgpu-core-deps-apple 26.0.0", + "wgpu-core-deps-emscripten 26.0.0", + "wgpu-core-deps-windows-linux-android 26.0.0", + "wgpu-hal 26.0.6", + "wgpu-types 26.0.0", +] + +[[package]] +name = "wgpu-core" +version = "27.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27a75de515543b1897b26119f93731b385a19aea165a1ec5f0e3acecc229cae7" +dependencies = [ + "arrayvec", + "bit-set", + "bit-vec", + "bitflags 2.10.0", + "bytemuck", + "cfg_aliases", + "document-features", + "hashbrown 0.16.1", + "indexmap", + "log", + "naga 27.0.3", "once_cell", "parking_lot", "portable-atomic", @@ -6468,12 +6570,12 @@ dependencies = [ "rustc-hash 1.1.0", "smallvec", "thiserror 2.0.17", - "wgpu-core-deps-apple", - "wgpu-core-deps-emscripten", + "wgpu-core-deps-apple 27.0.0", + "wgpu-core-deps-emscripten 27.0.0", "wgpu-core-deps-wasm", - "wgpu-core-deps-windows-linux-android", - "wgpu-hal", - "wgpu-types", + "wgpu-core-deps-windows-linux-android 27.0.0", + "wgpu-hal 27.0.4", + "wgpu-types 27.0.1", ] [[package]] @@ -6482,7 +6584,16 @@ version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18ae5fbde6a4cbebae38358aa73fcd6e0f15c6144b67ef5dc91ded0db125dbdf" dependencies = [ - "wgpu-hal", + "wgpu-hal 26.0.6", +] + +[[package]] +name = "wgpu-core-deps-apple" +version = "27.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0772ae958e9be0c729561d5e3fd9a19679bcdfb945b8b1a1969d9bfe8056d233" +dependencies = [ + "wgpu-hal 27.0.4", ] [[package]] @@ -6491,16 +6602,25 @@ version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7670e390f416006f746b4600fdd9136455e3627f5bd763abf9a65daa216dd2d" dependencies = [ - "wgpu-hal", + "wgpu-hal 26.0.6", +] + +[[package]] +name = "wgpu-core-deps-emscripten" +version = "27.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06ac3444a95b0813ecfd81ddb2774b66220b264b3e2031152a4a29fda4da6b5" +dependencies = [ + "wgpu-hal 27.0.4", ] [[package]] name = "wgpu-core-deps-wasm" -version = "26.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03b9f9e1a50686d315fc6debe4980cc45cd37b0e919351917df494e8fdc8885" +checksum = "9b1027dcf3b027a877e44819df7ceb0e2e98578830f8cd34cd6c3c7c2a7a50b7" dependencies = [ - "wgpu-hal", + "wgpu-hal 27.0.4", ] [[package]] @@ -6509,7 +6629,16 @@ version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "720a5cb9d12b3d337c15ff0e24d3e97ed11490ff3f7506e7f3d98c68fa5d6f14" dependencies = [ - "wgpu-hal", + "wgpu-hal 26.0.6", +] + +[[package]] +name = "wgpu-core-deps-windows-linux-android" +version = "27.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71197027d61a71748e4120f05a9242b2ad142e3c01f8c1b47707945a879a03c3" +dependencies = [ + "wgpu-hal 27.0.4", ] [[package]] @@ -6540,7 +6669,7 @@ dependencies = [ "libloading", "log", "metal", - "naga", + "naga 26.0.0", "ndk-sys", "objc", "ordered-float", @@ -6555,7 +6684,56 @@ dependencies = [ "thiserror 2.0.17", "wasm-bindgen", "web-sys", - "wgpu-types", + "wgpu-types 26.0.0", + "windows 0.58.0", + "windows-core 0.58.0", +] + +[[package]] +name = "wgpu-hal" +version = "27.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b21cb61c57ee198bc4aff71aeadff4cbb80b927beb912506af9c780d64313ce" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.10.0", + "block", + "bytemuck", + "cfg-if", + "cfg_aliases", + "core-graphics-types 0.2.0", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hashbrown 0.16.1", + "js-sys", + "khronos-egl", + "libc", + "libloading", + "log", + "metal", + "naga 27.0.3", + "ndk-sys", + "objc", + "once_cell", + "ordered-float", + "parking_lot", + "portable-atomic", + "portable-atomic-util", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "smallvec", + "thiserror 2.0.17", + "wasm-bindgen", + "web-sys", + "wgpu-types 27.0.1", "windows 0.58.0", "windows-core 0.58.0", ] @@ -6574,6 +6752,20 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wgpu-types" +version = "27.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afdcf84c395990db737f2dd91628706cb31e86d72e53482320d368e52b5da5eb" +dependencies = [ + "bitflags 2.10.0", + "bytemuck", + "js-sys", + "log", + "thiserror 2.0.17", + "web-sys", +] + [[package]] name = "wide" version = "0.7.32" diff --git a/Cargo.toml b/Cargo.toml index d679b92664ae..2cd60d67e246 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,8 +51,8 @@ version = "0.1.0" [workspace.dependencies] tracing = "0.1.43" tracing-subscriber = { version = "0.3.22", features = ["env-filter"] } -naga = { version = "26.0.0", features = ["wgsl-out"] } -wgpu = "26.0.1" +naga = { version = "27.0.3", features = ["wgsl-out"] } +wgpu = "27.0.1" egui = { git = "https://github.com/emilk/egui.git", branch = "main" } clap = { version = "4.5.53", features = ["derive"] } cpal = "0.16.0"