diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml index 6d67201f5..496ed9a33 100644 --- a/.github/workflows/release_nightly.yml +++ b/.github/workflows/release_nightly.yml @@ -99,7 +99,7 @@ jobs: # wasm-bindgen-cli version must match wasm-bindgen crate version. # Be sure to update in test_web.yml, web/Cargo.toml and web/README.md. - name: Install wasm-bindgen - run: cargo install wasm-bindgen-cli --version 0.2.69 + run: cargo install wasm-bindgen-cli --version 0.2.73 - name: Setup conda uses: conda-incubator/setup-miniconda@v2 diff --git a/.github/workflows/test_web.yml b/.github/workflows/test_web.yml index d718b35ee..f974d96f5 100644 --- a/.github/workflows/test_web.yml +++ b/.github/workflows/test_web.yml @@ -38,7 +38,7 @@ jobs: # wasm-bindgen-cli version must match wasm-bindgen crate version. # Be sure to update in release_nightly.yml, web/Cargo.toml and web/README.md. - name: Install wasm-bindgen - run: cargo install wasm-bindgen-cli --version 0.2.69 + run: cargo install wasm-bindgen-cli --version 0.2.73 - name: Setup conda uses: conda-incubator/setup-miniconda@v2 diff --git a/Cargo.lock b/Cargo.lock index 077230d0f..b53e230cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -108,14 +108,17 @@ name = "arrayvec" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +dependencies = [ + "serde", +] [[package]] name = "ash" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c69a8137596e84c22d57f3da1b5de1d4230b1742a710091c85f4d7ce50f00f38" +checksum = "06063a002a77d2734631db74e8f4ce7148b77fe522e6bca46f2ae7774fd48112" dependencies = [ - "libloading", + "libloading 0.7.0", ] [[package]] @@ -358,7 +361,7 @@ checksum = "0659001ab56b791be01d4b729c44376edc6718cf389a502e579b77b758f3296c" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.6.7", ] [[package]] @@ -461,6 +464,16 @@ dependencies = [ "objc", ] +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + [[package]] name = "color_quant" version = "1.1.0" @@ -801,11 +814,10 @@ dependencies = [ [[package]] name = "d3d12" version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a60cceb22c7c53035f8980524fdc7f17cf49681a3c154e6757d30afbec6ec4" +source = "git+https://github.com/gfx-rs/d3d12-rs?rev=be19a243b86e0bafb9937d661fc8eabb3e42b44e#be19a243b86e0bafb9937d661fc8eabb3e42b44e" dependencies = [ "bitflags", - "libloading", + "libloading 0.7.0", "winapi 0.3.9", ] @@ -1011,7 +1023,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76" dependencies = [ - "libloading", + "libloading 0.6.7", ] [[package]] @@ -1361,8 +1373,7 @@ dependencies = [ [[package]] name = "gfx-auxil" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7b33ecf067f2117668d91c9b0f2e5f223ebd1ffec314caa2f3de27bb580186d" +source = "git+https://github.com/gfx-rs/gfx?rev=e98889ff9a4919620de1f412d46135e180d3fa30#e98889ff9a4919620de1f412d46135e180d3fa30" dependencies = [ "fxhash", "gfx-hal", @@ -1372,14 +1383,13 @@ dependencies = [ [[package]] name = "gfx-backend-dx11" version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f851d03c2e8f117e3702bf41201a4fafa447d5cb1276d5375870ae7573d069dd" +source = "git+https://github.com/gfx-rs/gfx?rev=e98889ff9a4919620de1f412d46135e180d3fa30#e98889ff9a4919620de1f412d46135e180d3fa30" dependencies = [ "arrayvec", "bitflags", "gfx-auxil", "gfx-hal", - "libloading", + "libloading 0.7.0", "log", "parking_lot", "range-alloc", @@ -1394,8 +1404,7 @@ dependencies = [ [[package]] name = "gfx-backend-dx12" version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36dc6ba2b7647e2c2b27b8f74ff5ccdd53c703776588eee5b1de515fdcbd6bc9" +source = "git+https://github.com/gfx-rs/gfx?rev=e98889ff9a4919620de1f412d46135e180d3fa30#e98889ff9a4919620de1f412d46135e180d3fa30" dependencies = [ "arrayvec", "bit-set", @@ -1409,14 +1418,14 @@ dependencies = [ "raw-window-handle", "smallvec", "spirv_cross", + "thunderdome", "winapi 0.3.9", ] [[package]] name = "gfx-backend-empty" version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f07ef26a65954cfdd7b4c587f485100d1bb3b0bd6a51b02d817d6c87cca7a91" +source = "git+https://github.com/gfx-rs/gfx?rev=e98889ff9a4919620de1f412d46135e180d3fa30#e98889ff9a4919620de1f412d46135e180d3fa30" dependencies = [ "gfx-hal", "log", @@ -1426,22 +1435,20 @@ dependencies = [ [[package]] name = "gfx-backend-gl" version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17fd85420547bceb851fadb90f196f168abfc252d57528bd2d749db0d18b75f" +source = "git+https://github.com/gfx-rs/gfx?rev=e98889ff9a4919620de1f412d46135e180d3fa30#e98889ff9a4919620de1f412d46135e180d3fa30" dependencies = [ "arrayvec", "bitflags", - "gfx-auxil", + "fxhash", "gfx-hal", "glow", "js-sys", "khronos-egl", - "libloading", + "libloading 0.7.0", "log", "naga", "parking_lot", "raw-window-handle", - "spirv_cross", "wasm-bindgen", "web-sys", ] @@ -1449,8 +1456,7 @@ dependencies = [ [[package]] name = "gfx-backend-metal" version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dc54b456ece69ef49f8893269ebf24ac70969ed34ba2719c3f3abcc8fbff14e" +source = "git+https://github.com/gfx-rs/gfx?rev=e98889ff9a4919620de1f412d46135e180d3fa30#e98889ff9a4919620de1f412d46135e180d3fa30" dependencies = [ "arrayvec", "bitflags", @@ -1458,7 +1464,7 @@ dependencies = [ "cocoa-foundation", "copyless", "foreign-types", - "gfx-auxil", + "fxhash", "gfx-hal", "log", "metal", @@ -1467,15 +1473,13 @@ dependencies = [ "parking_lot", "range-alloc", "raw-window-handle", - "spirv_cross", "storage-map", ] [[package]] name = "gfx-backend-vulkan" version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabe88b1a5c91e0f969b441cc57e70364858066e4ba937deeb62065654ef9bd9" +source = "git+https://github.com/gfx-rs/gfx?rev=e98889ff9a4919620de1f412d46135e180d3fa30#e98889ff9a4919620de1f412d46135e180d3fa30" dependencies = [ "arrayvec", "ash", @@ -1495,8 +1499,7 @@ dependencies = [ [[package]] name = "gfx-hal" version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d9cc8d3b573dda62d0baca4f02e0209786e22c562caff001d77c389008781d" +source = "git+https://github.com/gfx-rs/gfx?rev=e98889ff9a4919620de1f412d46135e180d3fa30#e98889ff9a4919620de1f412d46135e180d3fa30" dependencies = [ "bitflags", "naga", @@ -1534,34 +1537,30 @@ dependencies = [ [[package]] name = "gpu-alloc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7724b9aef57ea36d70faf54e0ee6265f86e41de16bed8333efdeab5b00e16b" +version = "0.4.2" +source = "git+https://github.com/zakarumych/gpu-alloc.git?rev=2cd1ad650cdd24d1647b6041f77ced0cbf1ff2a6#2cd1ad650cdd24d1647b6041f77ced0cbf1ff2a6" dependencies = [ "bitflags", "gpu-alloc-types", - "tracing", ] [[package]] name = "gpu-alloc-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" +version = "0.2.1" +source = "git+https://github.com/zakarumych/gpu-alloc.git?rev=2cd1ad650cdd24d1647b6041f77ced0cbf1ff2a6#2cd1ad650cdd24d1647b6041f77ced0cbf1ff2a6" dependencies = [ "bitflags", ] [[package]] name = "gpu-descriptor" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d74668a6a6f0202e29f212a6d47ef8c7e092a76f4ab267b0065b6e0d175e45c6" +checksum = "e8a70f1e87a3840ed6a3e99e02c2b861e4dbdf26f0d07e38f42ea5aff46cfce2" dependencies = [ "bitflags", "gpu-descriptor-types", "hashbrown", - "tracing", ] [[package]] @@ -1773,9 +1772,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.46" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175" +checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" dependencies = [ "wasm-bindgen", ] @@ -1798,12 +1797,12 @@ dependencies = [ [[package]] name = "khronos-egl" -version = "3.0.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8020ff3b84f9ac87461216ad0501bc09b33c1cbe17404d8ea405160fd164bab" +checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" dependencies = [ "libc", - "libloading", + "libloading 0.7.0", ] [[package]] @@ -1852,6 +1851,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "libloading" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" +dependencies = [ + "cfg-if 1.0.0", + "winapi 0.3.9", +] + [[package]] name = "libnghttp2-sys" version = "0.1.6+1.43.0" @@ -2011,8 +2020,7 @@ dependencies = [ [[package]] name = "metal" version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4598d719460ade24c7d91f335daf055bf2a7eec030728ce751814c50cdd6a26c" +source = "git+https://github.com/gfx-rs/metal-rs?rev=439c986eb7a9b91e88b61def2daa66e4043fcbef#439c986eb7a9b91e88b61def2daa66e4043fcbef" dependencies = [ "bitflags", "block", @@ -2113,16 +2121,15 @@ dependencies = [ [[package]] name = "naga" version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f30d7036f137a2f64fd7d53b70a91545d3f09e030b77b3816ff7bd4cf3f789" +source = "git+https://github.com/gfx-rs/naga?tag=gfx-21#98252cf5d29790f85cc4397e0cf7a5b6cfaac614" dependencies = [ "bit-set", "bitflags", + "codespan-reporting", "fxhash", "log", "num-traits", "petgraph", - "serde", "spirv_headers", "thiserror", ] @@ -2697,6 +2704,12 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "profiling" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c71198452babfbba7419e716d29853c462d59da73c41485ab7dc8b4dc0c4be" + [[package]] name = "puremp3" version = "0.1.0" @@ -2758,8 +2771,7 @@ dependencies = [ [[package]] name = "range-alloc" version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e935c45e09cc6dcf00d2f0b2d630a58f4095320223d47fc68918722f0538b6" +source = "git+https://github.com/gfx-rs/gfx?rev=e98889ff9a4919620de1f412d46135e180d3fa30#e98889ff9a4919620de1f412d46135e180d3fa30" [[package]] name = "raw-window-handle" @@ -3263,9 +3275,9 @@ dependencies = [ [[package]] name = "spirv_cross" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06db6bd7b6518f761593783e2896eefe55e90455efc5f44511078ce0426ed418" +checksum = "60647fadbf83c4a72f0d7ea67a7ca3a81835cf442b8deae5c134c3e0055b2e14" dependencies = [ "cc", "js-sys", @@ -3371,9 +3383,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.65" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1d708c221c5a612956ef9f75b37e454e88d1f7b899fbd3a18d4252012d663" +checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" dependencies = [ "proc-macro2", "quote", @@ -3694,9 +3706,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.69" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e" +checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" dependencies = [ "cfg-if 1.0.0", "serde", @@ -3706,9 +3718,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.69" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62" +checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" dependencies = [ "bumpalo", "lazy_static", @@ -3721,9 +3733,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.19" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35" +checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3733,9 +3745,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.69" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084" +checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3743,9 +3755,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.69" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549" +checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" dependencies = [ "proc-macro2", "quote", @@ -3756,9 +3768,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.69" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" +checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" [[package]] name = "wasm-bindgen-test" @@ -3865,9 +3877,9 @@ checksum = "9a8f3bf74f2d43500dea6a8291b6ac943e3465ea9936b94bd017e61b7b21dd01" [[package]] name = "web-sys" -version = "0.3.46" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3" +checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" dependencies = [ "js-sys", "wasm-bindgen", @@ -3901,19 +3913,18 @@ dependencies = [ [[package]] name = "wgpu" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a0a0a63fac9492cfaf6e7e4bdf9729c128f1e94124b9e4cbc4004b8cb6d1d8" +version = "0.7.0" +source = "git+https://github.com/gfx-rs/wgpu-rs?rev=50e0577#50e05776d128f2815f629e8064eb807b06ee013f" dependencies = [ "arrayvec", "js-sys", + "log", "naga", "parking_lot", + "profiling", "raw-window-handle", "serde", "smallvec", - "syn", - "tracing", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -3924,8 +3935,7 @@ dependencies = [ [[package]] name = "wgpu-core" version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d0b0acbc906c464cb75dac28062a8591ec9fe0ce61e271bb732c43196dc6aa1" +source = "git+https://github.com/gfx-rs/wgpu?rev=6a6a9a4aedbbf7c8cc6b11a4b0c42341ac50a798#6a6a9a4aedbbf7c8cc6b11a4b0c42341ac50a798" dependencies = [ "arrayvec", "bitflags", @@ -3941,22 +3951,22 @@ dependencies = [ "gfx-hal", "gpu-alloc", "gpu-descriptor", + "log", "naga", "parking_lot", + "profiling", "raw-window-handle", "ron", "serde", "smallvec", "thiserror", - "tracing", "wgpu-types", ] [[package]] name = "wgpu-types" version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72fa9ba80626278fd87351555c363378d08122d7601e58319be3d6fa85a87747" +source = "git+https://github.com/gfx-rs/wgpu?rev=6a6a9a4aedbbf7c8cc6b11a4b0c42341ac50a798#6a6a9a4aedbbf7c8cc6b11a4b0c42341ac50a798" dependencies = [ "bitflags", "serde", diff --git a/render/canvas/Cargo.toml b/render/canvas/Cargo.toml index 49f8a2b97..179a3042c 100644 --- a/render/canvas/Cargo.toml +++ b/render/canvas/Cargo.toml @@ -11,13 +11,13 @@ crate-type = ["cdylib", "rlib"] [dependencies] base64 = "0.13.0" fnv = "1.0.7" -js-sys = "0.3.46" +js-sys = "0.3.50" log = "0.4" ruffle_web_common = { path = "../../web/common" } svg = "0.9.1" percent-encoding = "2.1.0" png = "0.16.8" -wasm-bindgen = "=0.2.69" +wasm-bindgen = "=0.2.73" [dependencies.jpeg-decoder] version = "0.1.22" diff --git a/render/webgl/Cargo.toml b/render/webgl/Cargo.toml index 0e23a45a5..583ff5ac7 100644 --- a/render/webgl/Cargo.toml +++ b/render/webgl/Cargo.toml @@ -7,13 +7,13 @@ license = "MIT OR Apache-2.0" [dependencies] fnv = "1.0.7" -js-sys = "0.3.46" +js-sys = "0.3.50" log = "0.4" percent-encoding = "2.1.0" png = "0.16.8" ruffle_render_common_tess = { path = "../common_tess" } ruffle_web_common = { path = "../../web/common" } -wasm-bindgen = "=0.2.69" +wasm-bindgen = "=0.2.73" bytemuck = { version = "1.5.1", features = ["derive"] } [dependencies.jpeg-decoder] diff --git a/web/Cargo.toml b/web/Cargo.toml index f84bd38f2..74017f7e3 100644 --- a/web/Cargo.toml +++ b/web/Cargo.toml @@ -26,13 +26,13 @@ console_error_panic_hook = { version = "0.1.1", optional = true } console_log = { version = "0.2", optional = true } fnv = "1.0.7" generational-arena = "0.2.8" -js-sys = "0.3.46" +js-sys = "0.3.50" log = { version = "0.4", features = ["serde"] } ruffle_render_canvas = { path = "../render/canvas", optional = true } ruffle_web_common = { path = "common" } ruffle_render_webgl = { path = "../render/webgl", optional = true } url = "2.2.1" -wasm-bindgen = { version = "=0.2.69", features = ["serde-serialize"] } +wasm-bindgen = { version = "=0.2.73", features = ["serde-serialize"] } wasm-bindgen-futures = "0.4.19" chrono = { version = "0.4", features = ["wasmbind"] } getrandom = { version = "0.2", features = ["js"] } diff --git a/web/README.md b/web/README.md index f17972e64..5115cbbd5 100644 --- a/web/README.md +++ b/web/README.md @@ -55,7 +55,7 @@ We recommend using the currently active LTS 12, but we do also run tests with ma #### wasm-bindgen -This can be installed with `cargo install wasm-bindgen-cli --version 0.2.69`. Be sure to install this specific version of `wasm-bindgen-cli` to match the version used by Ruffle. +This can be installed with `cargo install wasm-bindgen-cli --version 0.2.73`. Be sure to install this specific version of `wasm-bindgen-cli` to match the version used by Ruffle. #### Binaryen diff --git a/web/common/Cargo.toml b/web/common/Cargo.toml index 08fead812..6a2ff76c8 100644 --- a/web/common/Cargo.toml +++ b/web/common/Cargo.toml @@ -6,9 +6,9 @@ edition = "2018" license = "MIT OR Apache-2.0" [dependencies] -js-sys = "0.3.46" +js-sys = "0.3.50" log = "0.4" -wasm-bindgen = "=0.2.69" +wasm-bindgen = "=0.2.73" [dependencies.web-sys] version = "0.3.41"