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
This commit is contained in:
TÖRÖK Attila 2024-07-16 16:55:05 +02:00 committed by Nathan Adams
parent 07c9901efe
commit 799b536766
6 changed files with 3 additions and 68 deletions

36
Cargo.lock generated
View File

@ -229,9 +229,6 @@ name = "arrayvec"
version = "0.7.4" version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
dependencies = [
"serde",
]
[[package]] [[package]]
name = "as-raw-xcb-connection" name = "as-raw-xcb-connection"
@ -448,12 +445,6 @@ dependencies = [
"rustc-demangle", "rustc-demangle",
] ]
[[package]]
name = "base64"
version = "0.21.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
[[package]] [[package]]
name = "base64" name = "base64"
version = "0.22.1" version = "0.22.1"
@ -509,9 +500,6 @@ name = "bitflags"
version = "2.6.0" version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
dependencies = [
"serde",
]
[[package]] [[package]]
name = "bitstream-io" name = "bitstream-io"
@ -2636,7 +2624,6 @@ checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
dependencies = [ dependencies = [
"equivalent", "equivalent",
"hashbrown", "hashbrown",
"serde",
] ]
[[package]] [[package]]
@ -3215,7 +3202,6 @@ dependencies = [
"log", "log",
"num-traits", "num-traits",
"rustc-hash", "rustc-hash",
"serde",
"spirv", "spirv",
"termcolor", "termcolor",
"thiserror", "thiserror",
@ -4195,7 +4181,7 @@ version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
dependencies = [ dependencies = [
"base64 0.22.1", "base64",
"bytes", "bytes",
"cookie", "cookie",
"cookie_store", "cookie_store",
@ -4275,18 +4261,6 @@ dependencies = [
"windows-sys 0.52.0", "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]] [[package]]
name = "roxmltree" name = "roxmltree"
version = "0.19.0" version = "0.19.0"
@ -4634,7 +4608,7 @@ name = "ruffle_web"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"async-channel", "async-channel",
"base64 0.22.1", "base64",
"chrono", "chrono",
"console_error_panic_hook", "console_error_panic_hook",
"futures", "futures",
@ -4763,7 +4737,7 @@ version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
dependencies = [ dependencies = [
"base64 0.22.1", "base64",
"rustls-pki-types", "rustls-pki-types",
] ]
@ -6275,7 +6249,6 @@ dependencies = [
"parking_lot", "parking_lot",
"profiling", "profiling",
"raw-window-handle", "raw-window-handle",
"serde",
"smallvec", "smallvec",
"static_assertions", "static_assertions",
"wasm-bindgen", "wasm-bindgen",
@ -6305,9 +6278,7 @@ dependencies = [
"parking_lot", "parking_lot",
"profiling", "profiling",
"raw-window-handle", "raw-window-handle",
"ron",
"rustc-hash", "rustc-hash",
"serde",
"smallvec", "smallvec",
"thiserror", "thiserror",
"web-sys", "web-sys",
@ -6368,7 +6339,6 @@ checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"js-sys", "js-sys",
"serde",
"web-sys", "web-sys",
] ]

View File

@ -74,7 +74,6 @@ tracy = ["tracing-tracy", "ruffle_render_wgpu/profile-with-tracy"]
# wgpu features # wgpu features
render_debug_labels = ["ruffle_render_wgpu/render_debug_labels"] render_debug_labels = ["ruffle_render_wgpu/render_debug_labels"]
render_trace = ["ruffle_render_wgpu/render_trace"]
# sandboxing # sandboxing
sandbox = [] sandbox = []

View File

@ -103,11 +103,6 @@ pub struct Opt {
#[clap(long, action)] #[clap(long, action)]
pub force_scale: bool, pub force_scale: bool,
/// Location to store a wgpu trace output
#[clap(long)]
#[cfg(feature = "render_trace")]
trace_path: Option<std::path::PathBuf>,
/// Location to store save data for games. /// Location to store save data for games.
/// ///
/// This option has no effect if `storage` is not `disk`. /// 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 { 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> { pub fn trace_path(&self) -> Option<&Path> {
None None
} }

View File

@ -24,5 +24,4 @@ anyhow = { workspace = true }
[features] [features]
avm_debug = ["ruffle_core/avm_debug"] avm_debug = ["ruffle_core/avm_debug"]
render_debug_labels = ["ruffle_render_wgpu/render_debug_labels"] render_debug_labels = ["ruffle_render_wgpu/render_debug_labels"]
render_trace = ["ruffle_render_wgpu/render_trace"]
lzma = ["ruffle_core/lzma"] lzma = ["ruffle_core/lzma"]

View File

@ -73,11 +73,6 @@ struct Opt {
#[clap(long, short, default_value = "high")] #[clap(long, short, default_value = "high")]
power: PowerPreference, power: PowerPreference,
/// Location to store a wgpu trace output
#[clap(long)]
#[cfg(feature = "render_trace")]
trace_path: Option<PathBuf>,
/// Skip unsupported movie types (currently AVM 2) /// Skip unsupported movie types (currently AVM 2)
#[clap(long, action)] #[clap(long, action)]
skip_unsupported: bool, skip_unsupported: bool,
@ -382,17 +377,6 @@ fn capture_multiple_swfs(descriptors: Arc<Descriptors>, opt: &Opt) -> Result<()>
Ok(()) 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> { fn trace_path(_opt: &Opt) -> Option<&Path> {
None None
} }

View File

@ -38,7 +38,6 @@ features = ["HtmlCanvasElement"]
[features] [features]
render_debug_labels = [] render_debug_labels = []
render_trace = ["wgpu/trace"]
webgl = ["wgpu/webgl"] webgl = ["wgpu/webgl"]
profile-with-tracy = ["profiling", "profiling/profile-with-tracy"] profile-with-tracy = ["profiling", "profiling/profile-with-tracy"]