From 799b5367663f20e71a9772a68cc52c7c498e8a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=96R=C3=96K=20Attila?= Date: Tue, 16 Jul 2024 16:55:05 +0200 Subject: [PATCH] render: Remove the `render_trace` feature Since wgpu has (temporarily) removed its `trace` feature. https://github.com/gfx-rs/wgpu/pull/5975 https://github.com/gfx-rs/wgpu/issues/5974 https://github.com/gfx-rs/wgpu/pull/5897 --- Cargo.lock | 36 +++--------------------------------- desktop/Cargo.toml | 1 - desktop/src/cli.rs | 16 ---------------- exporter/Cargo.toml | 1 - exporter/src/main.rs | 16 ---------------- render/wgpu/Cargo.toml | 1 - 6 files changed, 3 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3f2f49993..249b5ed6d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -229,9 +229,6 @@ name = "arrayvec" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -dependencies = [ - "serde", -] [[package]] name = "as-raw-xcb-connection" @@ -448,12 +445,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -509,9 +500,6 @@ name = "bitflags" version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -dependencies = [ - "serde", -] [[package]] name = "bitstream-io" @@ -2636,7 +2624,6 @@ checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", "hashbrown", - "serde", ] [[package]] @@ -3215,7 +3202,6 @@ dependencies = [ "log", "num-traits", "rustc-hash", - "serde", "spirv", "termcolor", "thiserror", @@ -4195,7 +4181,7 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "cookie", "cookie_store", @@ -4275,18 +4261,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "ron" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" -dependencies = [ - "base64 0.21.7", - "bitflags 2.6.0", - "serde", - "serde_derive", -] - [[package]] name = "roxmltree" version = "0.19.0" @@ -4634,7 +4608,7 @@ name = "ruffle_web" version = "0.1.0" dependencies = [ "async-channel", - "base64 0.22.1", + "base64", "chrono", "console_error_panic_hook", "futures", @@ -4763,7 +4737,7 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.22.1", + "base64", "rustls-pki-types", ] @@ -6275,7 +6249,6 @@ dependencies = [ "parking_lot", "profiling", "raw-window-handle", - "serde", "smallvec", "static_assertions", "wasm-bindgen", @@ -6305,9 +6278,7 @@ dependencies = [ "parking_lot", "profiling", "raw-window-handle", - "ron", "rustc-hash", - "serde", "smallvec", "thiserror", "web-sys", @@ -6368,7 +6339,6 @@ checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef" dependencies = [ "bitflags 2.6.0", "js-sys", - "serde", "web-sys", ] diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml index 6b668560f..b8693e193 100644 --- a/desktop/Cargo.toml +++ b/desktop/Cargo.toml @@ -74,7 +74,6 @@ tracy = ["tracing-tracy", "ruffle_render_wgpu/profile-with-tracy"] # wgpu features render_debug_labels = ["ruffle_render_wgpu/render_debug_labels"] -render_trace = ["ruffle_render_wgpu/render_trace"] # sandboxing sandbox = [] diff --git a/desktop/src/cli.rs b/desktop/src/cli.rs index 369b77ab3..944128c7d 100644 --- a/desktop/src/cli.rs +++ b/desktop/src/cli.rs @@ -103,11 +103,6 @@ pub struct Opt { #[clap(long, action)] pub force_scale: bool, - /// Location to store a wgpu trace output - #[clap(long)] - #[cfg(feature = "render_trace")] - trace_path: Option, - /// Location to store save data for games. /// /// This option has no effect if `storage` is not `disk`. @@ -271,17 +266,6 @@ fn parse_gamepad_button(mapping: &str) -> Result<(GamepadButton, KeyCode), Error } impl Opt { - #[cfg(feature = "render_trace")] - pub fn trace_path(&self) -> Option<&Path> { - if let Some(path) = &self.trace_path { - let _ = std::fs::create_dir_all(path); - Some(path) - } else { - None - } - } - - #[cfg(not(feature = "render_trace"))] pub fn trace_path(&self) -> Option<&Path> { None } diff --git a/exporter/Cargo.toml b/exporter/Cargo.toml index 8e96c50af..93066a30d 100644 --- a/exporter/Cargo.toml +++ b/exporter/Cargo.toml @@ -24,5 +24,4 @@ anyhow = { workspace = true } [features] avm_debug = ["ruffle_core/avm_debug"] render_debug_labels = ["ruffle_render_wgpu/render_debug_labels"] -render_trace = ["ruffle_render_wgpu/render_trace"] lzma = ["ruffle_core/lzma"] diff --git a/exporter/src/main.rs b/exporter/src/main.rs index 753c9c58e..d10bdfaae 100644 --- a/exporter/src/main.rs +++ b/exporter/src/main.rs @@ -73,11 +73,6 @@ struct Opt { #[clap(long, short, default_value = "high")] power: PowerPreference, - /// Location to store a wgpu trace output - #[clap(long)] - #[cfg(feature = "render_trace")] - trace_path: Option, - /// Skip unsupported movie types (currently AVM 2) #[clap(long, action)] skip_unsupported: bool, @@ -382,17 +377,6 @@ fn capture_multiple_swfs(descriptors: Arc, opt: &Opt) -> Result<()> Ok(()) } -#[cfg(feature = "render_trace")] -fn trace_path(opt: &Opt) -> Option<&Path> { - if let Some(path) = &opt.trace_path { - let _ = std::fs::create_dir_all(path); - Some(path) - } else { - None - } -} - -#[cfg(not(feature = "render_trace"))] fn trace_path(_opt: &Opt) -> Option<&Path> { None } diff --git a/render/wgpu/Cargo.toml b/render/wgpu/Cargo.toml index 76aec8cac..8669c6fa9 100644 --- a/render/wgpu/Cargo.toml +++ b/render/wgpu/Cargo.toml @@ -38,7 +38,6 @@ features = ["HtmlCanvasElement"] [features] render_debug_labels = [] -render_trace = ["wgpu/trace"] webgl = ["wgpu/webgl"] profile-with-tracy = ["profiling", "profiling/profile-with-tracy"]