diff --git a/Cargo.lock b/Cargo.lock index f51e48007721..9f592d6d9797 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -526,12 +526,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "copyless" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536" - [[package]] name = "core-foundation" version = "0.9.3" @@ -909,7 +903,7 @@ dependencies = [ [[package]] name = "eframe" version = "0.19.0" -source = "git+https://github.com/emilk/egui?rev=3ec170cc1e2309345df04b5e2a083b3b452c012f#3ec170cc1e2309345df04b5e2a083b3b452c012f" +source = "git+https://github.com/emilk/egui?rev=7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b#7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b" dependencies = [ "bytemuck", "directories-next", @@ -936,7 +930,7 @@ dependencies = [ [[package]] name = "egui" version = "0.19.0" -source = "git+https://github.com/emilk/egui?rev=3ec170cc1e2309345df04b5e2a083b3b452c012f#3ec170cc1e2309345df04b5e2a083b3b452c012f" +source = "git+https://github.com/emilk/egui?rev=7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b#7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b" dependencies = [ "ahash 0.8.0", "epaint", @@ -949,7 +943,7 @@ dependencies = [ [[package]] name = "egui-wgpu" version = "0.19.0" -source = "git+https://github.com/emilk/egui?rev=3ec170cc1e2309345df04b5e2a083b3b452c012f#3ec170cc1e2309345df04b5e2a083b3b452c012f" +source = "git+https://github.com/emilk/egui?rev=7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b#7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b" dependencies = [ "bytemuck", "egui", @@ -963,7 +957,7 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.19.0" -source = "git+https://github.com/emilk/egui?rev=3ec170cc1e2309345df04b5e2a083b3b452c012f#3ec170cc1e2309345df04b5e2a083b3b452c012f" +source = "git+https://github.com/emilk/egui?rev=7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b#7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b" dependencies = [ "arboard", "egui", @@ -988,7 +982,7 @@ dependencies = [ [[package]] name = "egui_extras" version = "0.19.0" -source = "git+https://github.com/emilk/egui?rev=3ec170cc1e2309345df04b5e2a083b3b452c012f#3ec170cc1e2309345df04b5e2a083b3b452c012f" +source = "git+https://github.com/emilk/egui?rev=7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b#7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b" dependencies = [ "egui", "tracing", @@ -997,7 +991,7 @@ dependencies = [ [[package]] name = "egui_glow" version = "0.19.0" -source = "git+https://github.com/emilk/egui?rev=3ec170cc1e2309345df04b5e2a083b3b452c012f#3ec170cc1e2309345df04b5e2a083b3b452c012f" +source = "git+https://github.com/emilk/egui?rev=7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b#7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b" dependencies = [ "bytemuck", "egui", @@ -1019,7 +1013,7 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" [[package]] name = "emath" version = "0.19.0" -source = "git+https://github.com/emilk/egui?rev=3ec170cc1e2309345df04b5e2a083b3b452c012f#3ec170cc1e2309345df04b5e2a083b3b452c012f" +source = "git+https://github.com/emilk/egui?rev=7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b#7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b" dependencies = [ "bytemuck", "serde", @@ -1028,7 +1022,7 @@ dependencies = [ [[package]] name = "epaint" version = "0.19.0" -source = "git+https://github.com/emilk/egui?rev=3ec170cc1e2309345df04b5e2a083b3b452c012f#3ec170cc1e2309345df04b5e2a083b3b452c012f" +source = "git+https://github.com/emilk/egui?rev=7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b#7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b" dependencies = [ "ab_glyph", "ahash 0.8.0", @@ -1768,12 +1762,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" -[[package]] -name = "inplace_it" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e567468c50f3d4bc7397702e09b380139f9b9288b4e909b070571007f8b5bf78" - [[package]] name = "instant" version = "0.1.12" @@ -1847,9 +1835,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.59" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" dependencies = [ "wasm-bindgen", ] @@ -2082,9 +2070,9 @@ dependencies = [ [[package]] name = "naga" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f50357e1167a3ab92d6b3c7f4bf5f7fd13fde3f4b28bf0d5ea07b5100fdb6c0" +checksum = "262d2840e72dbe250e8cf2f522d080988dfca624c4112c096238a4845f591707" dependencies = [ "bit-set", "bitflags", @@ -3911,9 +3899,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.32" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" dependencies = [ "cfg-if", "js-sys", @@ -4044,9 +4032,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.59" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" dependencies = [ "js-sys", "wasm-bindgen", @@ -4095,17 +4083,18 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "wgpu" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "277e967bf8b7820a76852645a6bce8bbd31c32fda2042e82d8e3ea75fda8892d" +checksum = "c2272b17bffc8a0c7d53897435da7c1db587c87d3a14e8dae9cdb8d1d210fc0f" dependencies = [ "arrayvec 0.7.2", "js-sys", "log", "naga", "parking_lot", - "raw-window-handle 0.4.3", + "raw-window-handle 0.5.0", "smallvec", + "static_assertions", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -4116,22 +4105,21 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.13.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b92788dec9d0c1bed849a1b83f01b2ee12819bf04a79c90f68e4173f7b5ba2" +checksum = "73d14cad393054caf992ee02b7da6a372245d39a484f7461c1f44f6f6359bd28" dependencies = [ "arrayvec 0.7.2", "bit-vec", "bitflags", "cfg_aliases", "codespan-reporting", - "copyless", "fxhash", "log", "naga", "parking_lot", "profiling", - "raw-window-handle 0.4.3", + "raw-window-handle 0.5.0", "smallvec", "thiserror", "web-sys", @@ -4141,9 +4129,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.13.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cbdfc3d0637dba3d5536b93adef3d26023a0b96f0e1ee5ee9560a401d9f646" +checksum = "cdae6a80dbc725343f02f854b310b37190be946aeea65e9d83afaa7d840ebaac" dependencies = [ "android_system_properties", "arrayvec 0.7.2", @@ -4158,7 +4146,6 @@ dependencies = [ "glow", "gpu-alloc", "gpu-descriptor", - "inplace_it", "js-sys", "khronos-egl", "libloading", @@ -4169,8 +4156,9 @@ dependencies = [ "parking_lot", "profiling", "range-alloc", - "raw-window-handle 0.4.3", + "raw-window-handle 0.5.0", "renderdoc-sys", + "smallvec", "thiserror", "wasm-bindgen", "web-sys", @@ -4180,9 +4168,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.13.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f762cbc08e1a51389859cf9c199c7aef544789cf3510889aab12c607f701604" +checksum = "28fb86c1909233c804aa79b7dd1ad06ebd979b2a465e3e980582db0ea9e69f3f" dependencies = [ "bitflags", ] diff --git a/Cargo.toml b/Cargo.toml index 718fde6d1206..8f81fb8f7b51 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,12 +24,12 @@ opt-level = 2 debug = true [patch.crates-io] -# 2022-10-06 - wgpu on web -eframe = { git = "https://github.com/emilk/egui", rev = "3ec170cc1e2309345df04b5e2a083b3b452c012f" } -egui = { git = "https://github.com/emilk/egui", rev = "3ec170cc1e2309345df04b5e2a083b3b452c012f" } -egui_extras = { git = "https://github.com/emilk/egui", rev = "3ec170cc1e2309345df04b5e2a083b3b452c012f" } -egui_glow = { git = "https://github.com/emilk/egui", rev = "3ec170cc1e2309345df04b5e2a083b3b452c012f" } -egui-wgpu = { git = "https://github.com/emilk/egui", rev = "3ec170cc1e2309345df04b5e2a083b3b452c012f" } +# 2022-10-11 - wgpu update +eframe = { git = "https://github.com/emilk/egui", rev = "7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b" } +egui = { git = "https://github.com/emilk/egui", rev = "7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b" } +egui_extras = { git = "https://github.com/emilk/egui", rev = "7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b" } +egui_glow = { git = "https://github.com/emilk/egui", rev = "7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b" } +egui-wgpu = { git = "https://github.com/emilk/egui", rev = "7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b" } # Because gltf hasn't published a new version: https://github.com/gltf-rs/gltf/issues/357 gltf = { git = "https://github.com/rerun-io/gltf", rev = "3c14ded73755d1ce9e47010edb06db63cb7e2cca" } diff --git a/crates/re_viewer/Cargo.toml b/crates/re_viewer/Cargo.toml index bef6e65f3281..f2f9f66ad356 100644 --- a/crates/re_viewer/Cargo.toml +++ b/crates/re_viewer/Cargo.toml @@ -96,7 +96,7 @@ three-d-asset = { version = "0.3.0", optional = true, default-features = false, ] } egui-wgpu = { version = "0.19", optional = true } -wgpu = { version = "0.13", optional = true, features = ["webgl"] } +wgpu = { version = "0.14", optional = true, features = ["webgl"] } # native dependencies: