diff --git a/Cargo.lock b/Cargo.lock index f31a94f..726452f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -237,9 +237,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] name = "baseview" @@ -860,17 +860,6 @@ dependencies = [ "syn 2.0.15", ] -[[package]] -name = "d3d12" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827914e1f53b1e0e025ecd3d967a7836b7bcb54520f90e21ef8df7b4d88a2759" -dependencies = [ - "bitflags", - "libloading", - "winapi", -] - [[package]] name = "d3d12" version = "0.6.0" @@ -884,9 +873,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" dependencies = [ "darling_core", "darling_macro", @@ -894,27 +883,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "darling_macro" -version = "0.14.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ "darling_core", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -1139,7 +1128,7 @@ dependencies = [ "gb-emu-lib", "gilrs", "nokhwa", - "pixels 0.12.1", + "pixels", "send_wrapper", "winit", "winit_input_helper", @@ -1218,18 +1207,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "glow" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "glow" version = "0.12.1" @@ -1812,26 +1789,6 @@ dependencies = [ "nasm-rs", ] -[[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 = "naga" version = "0.11.0" @@ -2316,20 +2273,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pixels" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5169d2d398c75596005313afae6b4b26cb14a22210f148a0183de95b45795a5" -dependencies = [ - "bytemuck", - "pollster", - "raw-window-handle", - "thiserror", - "ultraviolet", - "wgpu 0.14.2", -] - [[package]] name = "pixels" version = "0.12.1" @@ -2341,7 +2284,7 @@ dependencies = [ "raw-window-handle", "thiserror", "ultraviolet", - "wgpu 0.15.1", + "wgpu", ] [[package]] @@ -2681,9 +2624,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.3.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331bb8c3bf9b92457ab7abecf07078c13f7d270ba490103e84e8b014490cd0b0" +checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513" dependencies = [ "base64", "chrono", @@ -2697,14 +2640,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "2.3.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859011bddcc11f289f07f467cc1fe01c7a941daa4d8f6c40d4d1c92eb6d9319c" +checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070" dependencies = [ "darling", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -3030,7 +2973,7 @@ dependencies = [ "gb-emu-lib", "keyboard-types", "nih_plug", - "pixels 0.11.0", + "pixels", ] [[package]] @@ -3235,28 +3178,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "wgpu" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f643110d228fd62a60c5ed2ab56c4d5b3704520bd50561174ec4ec74932937" -dependencies = [ - "arrayvec", - "js-sys", - "log", - "naga 0.10.0", - "parking_lot", - "raw-window-handle", - "smallvec", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core 0.14.2", - "wgpu-hal 0.14.1", - "wgpu-types 0.14.1", -] - [[package]] name = "wgpu" version = "0.15.1" @@ -3267,7 +3188,7 @@ dependencies = [ "cfg-if 1.0.0", "js-sys", "log", - "naga 0.11.0", + "naga", "parking_lot", "profiling", "raw-window-handle", @@ -3276,33 +3197,9 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core 0.15.1", - "wgpu-hal 0.15.4", - "wgpu-types 0.15.2", -] - -[[package]] -name = "wgpu-core" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6000d1284ef8eec6076fd5544a73125fd7eb9b635f18dceeb829d826f41724ca" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags", - "cfg_aliases", - "codespan-reporting", - "fxhash", - "log", - "naga 0.10.0", - "parking_lot", - "profiling", - "raw-window-handle", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal 0.14.1", - "wgpu-types 0.14.1", + "wgpu-core", + "wgpu-hal", + "wgpu-types", ] [[package]] @@ -3317,54 +3214,15 @@ dependencies = [ "codespan-reporting", "fxhash", "log", - "naga 0.11.0", + "naga", "parking_lot", "profiling", "raw-window-handle", "smallvec", "thiserror", "web-sys", - "wgpu-hal 0.15.4", - "wgpu-types 0.15.2", -] - -[[package]] -name = "wgpu-hal" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc320a61acb26be4f549c9b1b53405c10a223fbfea363ec39474c32c348d12f" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bit-set", - "bitflags", - "block", - "core-graphics-types", - "d3d12 0.5.0", - "foreign-types", - "fxhash", - "glow 0.11.2", - "gpu-alloc", - "gpu-descriptor", - "js-sys", - "khronos-egl", - "libloading", - "log", - "metal 0.24.0", - "naga 0.10.0", - "objc", - "parking_lot", - "profiling", - "range-alloc", - "raw-window-handle", - "renderdoc-sys", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types 0.14.1", - "winapi", + "wgpu-hal", + "wgpu-types", ] [[package]] @@ -3380,10 +3238,10 @@ dependencies = [ "bitflags", "block", "core-graphics-types", - "d3d12 0.6.0", + "d3d12", "foreign-types", "fxhash", - "glow 0.12.1", + "glow", "gpu-alloc", "gpu-allocator", "gpu-descriptor", @@ -3394,7 +3252,7 @@ dependencies = [ "libloading", "log", "metal 0.24.0", - "naga 0.11.0", + "naga", "objc", "parking_lot", "profiling", @@ -3405,19 +3263,10 @@ dependencies = [ "thiserror", "wasm-bindgen", "web-sys", - "wgpu-types 0.15.2", + "wgpu-types", "winapi", ] -[[package]] -name = "wgpu-types" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb6b28ef22cac17b9109b25b3bf8c9a103eeb293d7c5f78653979b09140375f6" -dependencies = [ - "bitflags", -] - [[package]] name = "wgpu-types" version = "0.15.2" diff --git a/gb-vst/Cargo.toml b/gb-vst/Cargo.toml index 95f8528..150771f 100644 --- a/gb-vst/Cargo.toml +++ b/gb-vst/Cargo.toml @@ -14,7 +14,7 @@ default = [] gb-emu-lib = { path = "../lib" } nih_plug = { path = "../vendored/nih-plug", features = ["standalone"] } baseview = { path = "../vendored/baseview" } -pixels = "0.11" +pixels = "0.12" async-ringbuf = "0.1.2" futures = "0.3" keyboard-types = "0.6.2" \ No newline at end of file diff --git a/gb-vst/src/ui.rs b/gb-vst/src/ui.rs index e71e1bb..03af8f5 100644 --- a/gb-vst/src/ui.rs +++ b/gb-vst/src/ui.rs @@ -148,7 +148,7 @@ impl WindowHandler for EmulatorWindow { } for (pixel, source) in self .pix - .get_frame_mut() + .frame_mut() .chunks_exact_mut(4) .zip(&self.scaled_buf) { diff --git a/lib/Cargo.toml b/lib/Cargo.toml index a139836..aba1e95 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -14,6 +14,6 @@ futures = "0.3" once_cell = "1.17.1" itertools = "0.10.5" serde = { version = "1.0", features = ["derive"] } -serde_with = "2.3.1" +serde_with = "3.0" bytemuck = "1.13" num-traits = "0.2"