From dfb34710f497216e43c98ab64df92d5b10ee5d7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=96R=C3=96K=20Attila?= Date: Sat, 22 Feb 2025 22:26:54 +0100 Subject: [PATCH] Switch to wgpu fork with backported GLES limits fix --- Cargo.lock | 15 +++++---------- Cargo.toml | 7 +++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a989c41..23d1cbb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2031,8 +2031,7 @@ dependencies = [ [[package]] name = "naga" version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e380993072e52eef724eddfcde0ed013b0c023c3f0417336ed041aa9f076994e" +source = "git+https://github.com/ruffle-rs/wgpu?tag=v24.0.1-ruffle1#f75a042f1c3e6f460d3b49d40717eef84b7da3f1" dependencies = [ "arrayvec", "bit-set", @@ -3940,8 +3939,7 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" version = "24.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47f55718f85c2fa756edffa0e7f0e0a60aba463d1362b57e23123c58f035e4b6" +source = "git+https://github.com/ruffle-rs/wgpu?tag=v24.0.1-ruffle1#f75a042f1c3e6f460d3b49d40717eef84b7da3f1" dependencies = [ "arrayvec", "bitflags 2.8.0", @@ -3966,8 +3964,7 @@ dependencies = [ [[package]] name = "wgpu-core" version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a39b8842dc9ffcbe34346e3ab6d496b32a47f6497e119d762c97fcaae3cb37" +source = "git+https://github.com/ruffle-rs/wgpu?tag=v24.0.1-ruffle1#f75a042f1c3e6f460d3b49d40717eef84b7da3f1" dependencies = [ "arrayvec", "bit-vec", @@ -3991,8 +3988,7 @@ dependencies = [ [[package]] name = "wgpu-hal" version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a782e5056b060b0b4010881d1decddd059e44f2ecd01e2db2971b48ad3627e5" +source = "git+https://github.com/ruffle-rs/wgpu?tag=v24.0.1-ruffle1#f75a042f1c3e6f460d3b49d40717eef84b7da3f1" dependencies = [ "android_system_properties", "arrayvec", @@ -4037,8 +4033,7 @@ dependencies = [ [[package]] name = "wgpu-types" version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50ac044c0e76c03a0378e7786ac505d010a873665e2d51383dcff8dd227dc69c" +source = "git+https://github.com/ruffle-rs/wgpu?tag=v24.0.1-ruffle1#f75a042f1c3e6f460d3b49d40717eef84b7da3f1" dependencies = [ "bitflags 2.8.0", "js-sys", diff --git a/Cargo.toml b/Cargo.toml index 7142123..4abd26b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,5 +50,12 @@ webbrowser = "1.0.3" tokio = { version = "1.43.0", features = ["rt-multi-thread", "macros"]} +# TODO: remove this when v25 releases with https://github.com/gfx-rs/wgpu/pull/6994 +# (or a v24.x with the backport: https://github.com/gfx-rs/wgpu/pull/7169) +# See also: https://github.com/ruffle-rs/ruffle/pull/19512 +[patch.crates-io] +wgpu = { git = "https://github.com/ruffle-rs/wgpu", tag = "v24.0.1-ruffle1" } +naga = { git = "https://github.com/ruffle-rs/wgpu", tag = "v24.0.1-ruffle1" } + [features] jpegxr = ["ruffle_core/jpegxr"]