render: Reintroduce the render_trace feature

desktop/Cargo.toml

@@ -74,6 +74,7 @@ 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 = []

desktop/src/cli.rs

@@ -103,6 +103,11 @@ 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`.
@@ -266,6 +271,17 @@ 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
     }

exporter/Cargo.toml

@@ -24,4 +24,5 @@ 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"]

exporter/src/main.rs

@@ -73,6 +73,11 @@ 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,
@@ -377,6 +382,17 @@ 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
 }

render/wgpu/Cargo.toml

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