diff --git a/Cargo.lock b/Cargo.lock index c8472cf..7a9292c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1515,6 +1515,26 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "naga" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "262d2840e72dbe250e8cf2f522d080988dfca624c4112c096238a4845f591707" +dependencies = [ + "bit-set", + "bitflags", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + [[package]] name = "native-tls" version = "0.2.10" @@ -1876,7 +1896,7 @@ dependencies = [ "raw-window-handle 0.4.3", "thiserror", "ultraviolet", - "wgpu", + "wgpu 0.13.1", ] [[package]] @@ -2340,7 +2360,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-bindgen-test", "web-sys", - "wgpu", + "wgpu 0.14.0", "winit", "winit_input_helper", ] @@ -2651,6 +2671,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "stdweb" version = "0.1.3" @@ -3303,16 +3329,38 @@ dependencies = [ "arrayvec 0.7.2", "js-sys", "log", - "naga", + "naga 0.9.0", "parking_lot", "raw-window-handle 0.4.3", "smallvec", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", + "wgpu-core 0.13.2", + "wgpu-hal 0.13.2", + "wgpu-types 0.13.2", +] + +[[package]] +name = "wgpu" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2272b17bffc8a0c7d53897435da7c1db587c87d3a14e8dae9cdb8d1d210fc0f" +dependencies = [ + "arrayvec 0.7.2", + "js-sys", + "log", + "naga 0.10.0", + "parking_lot", + "raw-window-handle 0.5.0", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core 0.14.0", + "wgpu-hal 0.14.0", + "wgpu-types 0.14.0", ] [[package]] @@ -3329,15 +3377,39 @@ dependencies = [ "copyless", "fxhash", "log", - "naga", + "naga 0.9.0", "parking_lot", "profiling", "raw-window-handle 0.4.3", "smallvec", "thiserror", "web-sys", - "wgpu-hal", - "wgpu-types", + "wgpu-hal 0.13.2", + "wgpu-types 0.13.2", +] + +[[package]] +name = "wgpu-core" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73d14cad393054caf992ee02b7da6a372245d39a484f7461c1f44f6f6359bd28" +dependencies = [ + "arrayvec 0.7.2", + "bit-vec", + "bitflags", + "cfg_aliases", + "codespan-reporting", + "fxhash", + "log", + "naga 0.10.0", + "parking_lot", + "profiling", + "raw-window-handle 0.5.0", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal 0.14.0", + "wgpu-types 0.14.0", ] [[package]] @@ -3365,7 +3437,7 @@ dependencies = [ "libloading", "log", "metal", - "naga", + "naga 0.9.0", "objc", "parking_lot", "profiling", @@ -3375,7 +3447,46 @@ dependencies = [ "thiserror", "wasm-bindgen", "web-sys", - "wgpu-types", + "wgpu-types 0.13.2", + "winapi", +] + +[[package]] +name = "wgpu-hal" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdae6a80dbc725343f02f854b310b37190be946aeea65e9d83afaa7d840ebaac" +dependencies = [ + "android_system_properties", + "arrayvec 0.7.2", + "ash", + "bit-set", + "bitflags", + "block", + "core-graphics-types", + "d3d12", + "foreign-types 0.3.2", + "fxhash", + "glow", + "gpu-alloc", + "gpu-descriptor", + "js-sys", + "khronos-egl", + "libloading", + "log", + "metal", + "naga 0.10.0", + "objc", + "parking_lot", + "profiling", + "range-alloc", + "raw-window-handle 0.5.0", + "renderdoc-sys", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types 0.14.0", "winapi", ] @@ -3388,6 +3499,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "wgpu-types" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28fb86c1909233c804aa79b7dd1ad06ebd979b2a465e3e980582db0ea9e69f3f" +dependencies = [ + "bitflags", +] + [[package]] name = "wide" version = "0.7.5" diff --git a/crates/rrr_wasm/Cargo.toml b/crates/rrr_wasm/Cargo.toml index 1b10a9f..fce7ca8 100644 --- a/crates/rrr_wasm/Cargo.toml +++ b/crates/rrr_wasm/Cargo.toml @@ -29,7 +29,7 @@ rrr_input = { path = "../rrr_input" } rrr_render = { path = "../rrr_render" } wasm-bindgen = "0.2.83" wasm-bindgen-futures = "0.4.33" -wgpu = { version = "0.13.1", features = ["webgl"] } +wgpu = { version = "0.14.0", features = ["webgl"] } winit = "0.27.4" winit_input_helper = "0.13.0"