Skip to content

Commit

Permalink
render: Remove the render_trace feature
Browse files Browse the repository at this point in the history
Since wgpu has (temporarily) removed its `trace` feature.
gfx-rs/wgpu#5975
gfx-rs/wgpu#5974
gfx-rs/wgpu#5897
  • Loading branch information
torokati44 committed Aug 5, 2024
1 parent a00d0e9 commit b9316a7
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 68 deletions.
36 changes: 3 additions & 33 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion desktop/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
16 changes: 0 additions & 16 deletions desktop/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<std::path::PathBuf>,

/// Location to store save data for games.
///
/// This option has no effect if `storage` is not `disk`.
Expand Down Expand Up @@ -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
}
Expand Down
1 change: 0 additions & 1 deletion exporter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
16 changes: 0 additions & 16 deletions exporter/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<PathBuf>,

/// Skip unsupported movie types (currently AVM 2)
#[clap(long, action)]
skip_unsupported: bool,
Expand Down Expand Up @@ -382,17 +377,6 @@ fn capture_multiple_swfs(descriptors: Arc<Descriptors>, 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
}
Expand Down
1 change: 0 additions & 1 deletion render/wgpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down

0 comments on commit b9316a7

Please sign in to comment.