diff --git a/Cargo.lock b/Cargo.lock index 929099bb..895c2d3d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -181,11 +181,11 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading", ] [[package]] @@ -288,18 +288,18 @@ dependencies = [ [[package]] name = "bit-set" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" [[package]] name = "bitflags" @@ -347,7 +347,7 @@ dependencies = [ [[package]] name = "build_playerglobal" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#a00d0e94992084b3b99dba9958391e9e78c2ee8e" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#f98999c2ac000df95bcbf0cad0b842129c79ed3b" dependencies = [ "clap", "convert_case", @@ -470,7 +470,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.8.4", + "libloading", ] [[package]] @@ -700,12 +700,12 @@ checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "d3d12" -version = "0.20.0" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813" +checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" dependencies = [ "bitflags 2.6.0", - "libloading 0.8.4", + "libloading", "winapi", ] @@ -1155,7 +1155,7 @@ dependencies = [ [[package]] name = "flv-rs" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#a00d0e94992084b3b99dba9958391e9e78c2ee8e" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#f98999c2ac000df95bcbf0cad0b842129c79ed3b" dependencies = [ "bitflags 2.6.0", "thiserror", @@ -1399,9 +1399,9 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] @@ -1427,9 +1427,9 @@ dependencies = [ [[package]] name = "gpu-allocator" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" dependencies = [ "log", "presser", @@ -1525,7 +1525,7 @@ dependencies = [ "bitflags 2.6.0", "com", "libc", - "libloading 0.8.4", + "libloading", "thiserror", "widestring", "winapi", @@ -1879,7 +1879,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.4", + "libloading", "pkg-config", ] @@ -1907,16 +1907,6 @@ version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - [[package]] name = "libloading" version = "0.8.4" @@ -2065,9 +2055,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "metal" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ "bitflags 2.6.0", "block", @@ -2114,18 +2104,18 @@ dependencies = [ [[package]] name = "naga" -version = "0.20.0" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" +checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" dependencies = [ "arrayvec", "bit-set", "bitflags 2.6.0", + "cfg_aliases", "codespan-reporting", "hexf-parse", "indexmap", "log", - "num-traits", "rustc-hash 1.1.0", "spirv", "termcolor", @@ -2136,7 +2126,7 @@ dependencies = [ [[package]] name = "naga-agal" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#a00d0e94992084b3b99dba9958391e9e78c2ee8e" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#f98999c2ac000df95bcbf0cad0b842129c79ed3b" dependencies = [ "bitflags 2.6.0", "naga", @@ -2147,7 +2137,7 @@ dependencies = [ [[package]] name = "naga-pixelbender" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#a00d0e94992084b3b99dba9958391e9e78c2ee8e" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#f98999c2ac000df95bcbf0cad0b842129c79ed3b" dependencies = [ "anyhow", "naga", @@ -2819,7 +2809,7 @@ dependencies = [ [[package]] name = "ruffle_core" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#a00d0e94992084b3b99dba9958391e9e78c2ee8e" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#f98999c2ac000df95bcbf0cad0b842129c79ed3b" dependencies = [ "async-channel", "bitflags 2.6.0", @@ -2881,7 +2871,7 @@ dependencies = [ [[package]] name = "ruffle_frontend_utils" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#a00d0e94992084b3b99dba9958391e9e78c2ee8e" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#f98999c2ac000df95bcbf0cad0b842129c79ed3b" dependencies = [ "async-channel", "async-io", @@ -2903,7 +2893,7 @@ dependencies = [ [[package]] name = "ruffle_gc_arena" version = "0.0.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#a00d0e94992084b3b99dba9958391e9e78c2ee8e" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#f98999c2ac000df95bcbf0cad0b842129c79ed3b" dependencies = [ "gc-arena", ] @@ -2911,7 +2901,7 @@ dependencies = [ [[package]] name = "ruffle_macros" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#a00d0e94992084b3b99dba9958391e9e78c2ee8e" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#f98999c2ac000df95bcbf0cad0b842129c79ed3b" dependencies = [ "quote", "syn 2.0.72", @@ -2920,7 +2910,7 @@ dependencies = [ [[package]] name = "ruffle_render" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#a00d0e94992084b3b99dba9958391e9e78c2ee8e" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#f98999c2ac000df95bcbf0cad0b842129c79ed3b" dependencies = [ "byteorder", "downcast-rs", @@ -2946,7 +2936,7 @@ dependencies = [ [[package]] name = "ruffle_render_wgpu" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#a00d0e94992084b3b99dba9958391e9e78c2ee8e" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#f98999c2ac000df95bcbf0cad0b842129c79ed3b" dependencies = [ "bytemuck", "enum-map", @@ -2968,7 +2958,7 @@ dependencies = [ [[package]] name = "ruffle_video" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#a00d0e94992084b3b99dba9958391e9e78c2ee8e" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#f98999c2ac000df95bcbf0cad0b842129c79ed3b" dependencies = [ "ruffle_render", "slotmap", @@ -2979,7 +2969,7 @@ dependencies = [ [[package]] name = "ruffle_video_software" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#a00d0e94992084b3b99dba9958391e9e78c2ee8e" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#f98999c2ac000df95bcbf0cad0b842129c79ed3b" dependencies = [ "flate2", "h263-rs", @@ -2998,7 +2988,7 @@ dependencies = [ [[package]] name = "ruffle_wstr" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#a00d0e94992084b3b99dba9958391e9e78c2ee8e" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#f98999c2ac000df95bcbf0cad0b842129c79ed3b" [[package]] name = "rustc-demangle" @@ -3295,7 +3285,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "swf" version = "0.2.1" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#a00d0e94992084b3b99dba9958391e9e78c2ee8e" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#f98999c2ac000df95bcbf0cad0b842129c79ed3b" dependencies = [ "bitflags 2.6.0", "bitstream-io", @@ -4002,12 +3992,11 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.20.1" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e37c7b9921b75dfd26dd973fdcbce36f13dfa6e2dc82aece584e0ed48c355c" +checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" dependencies = [ "arrayvec", - "cfg-if", "cfg_aliases", "document-features", "js-sys", @@ -4028,15 +4017,14 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.21.1" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39" +checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" dependencies = [ "arrayvec", "bit-vec", "bitflags 2.6.0", "cfg_aliases", - "codespan-reporting", "document-features", "indexmap", "log", @@ -4048,16 +4036,15 @@ dependencies = [ "rustc-hash 1.1.0", "smallvec", "thiserror", - "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.21.1" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222" +checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" dependencies = [ "android_system_properties", "arrayvec", @@ -4077,7 +4064,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.4", + "libloading", "log", "metal", "naga", @@ -4100,9 +4087,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.20.0" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef" +checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" dependencies = [ "bitflags 2.6.0", "js-sys", diff --git a/Cargo.toml b/Cargo.toml index aad5ad2d..dfcf891b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ ndk = { version = "0.9.0", features = ["audio"] } ndk-context = "0.1.1" # Have to follow Ruffle with this. -wgpu = "0.20.1" +wgpu = "22.1.0" ruffle_core = { git = "https://github.com/ruffle-rs/ruffle.git", branch = "master", features = [ "audio",