Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

fix renderdoc captures

Layle660a16683d1c
diff --git a/crates/backend-wgpu/src/sink.rs b/crates/backend-wgpu/src/sink.rs
index 1ecf5b6..893861b 100644
--- a/crates/backend-wgpu/src/sink.rs
+++ b/crates/backend-wgpu/src/sink.rs
@@ -50,6 +50,8 @@ struct RenderWorker {
shared: Arc<Shared>,
frame_ready_cb: Arc<OnceLock<FrameReadyCallback>>,
recycled_draw_data_tx: crossbeam_channel::Sender<Box<DrawData>>,
+ #[cfg(feature = "renderdoc-capture")]
+ renderdoc: Arc<Mutex<crate::renderdoc_capture::RenderDocCapture>>,
}
#[cfg(not(target_arch = "wasm32"))]
@@ -86,6 +88,10 @@ impl RenderWorker {
}
self.gx.submit_pending(&self.queue);
+ #[cfg(feature = "renderdoc-capture")]
+ if let Ok(mut rd) = self.renderdoc.lock() {
+ rd.end_emulated_frame();
+ }
match self.gx.save_shader_cache() {
Ok(n) => tracing::info!(num_variants = n, "saved shader cache"),
Err(err) => tracing::warn!(?err, "failed to save shader cache"),
@@ -106,6 +112,12 @@ impl RenderWorker {
match message.action {
GxAction::PresentXfb { .. } => {
+ #[cfg(feature = "renderdoc-capture")]
+ if let Ok(mut rd) = self.renderdoc.lock() {
+ rd.end_emulated_frame();
+ rd.begin_emulated_frame();
+ }
+
let view = self.gx.xfb_view.clone();
*self.shared.output.lock().unwrap() = view;
if let Some(cb) = self.frame_ready_cb.get() {
@@ -316,6 +328,9 @@ impl Renderer {
let frame_ready_cb: Arc<OnceLock<FrameReadyCallback>> = Arc::new(OnceLock::new());
+ #[cfg(feature = "renderdoc-capture")]
+ let renderdoc = Arc::new(Mutex::new(crate::renderdoc_capture::RenderDocCapture::new()));
+
let (work_tx, work_rx) = crossbeam_channel::bounded(WORK_QUEUE_LIMIT);
let (recycled_draw_data_tx, recycled_draw_data_rx) = crossbeam_channel::unbounded();
let worker = RenderWorker {
@@ -325,6 +340,8 @@ impl Renderer {
shared: shared.clone(),
frame_ready_cb: frame_ready_cb.clone(),
recycled_draw_data_tx,
+ #[cfg(feature = "renderdoc-capture")]
+ renderdoc: renderdoc.clone(),
};
let worker_thread = std::thread::Builder::new()
.name("backend-wgpu render".to_string())
@@ -348,26 +365,12 @@ impl Renderer {
target_aspect,
frame_ready_cb,
#[cfg(feature = "renderdoc-capture")]
- renderdoc: Arc::new(Mutex::new(crate::renderdoc_capture::RenderDocCapture::new())),
+ renderdoc,
};
(renderer, sink)
}
- #[cfg(feature = "renderdoc-capture")]
- pub fn begin_renderdoc_emulated_frame(&self) {
- if let Ok(mut rd) = self.renderdoc.lock() {
- rd.begin_emulated_frame();
- }
- }
-
- #[cfg(feature = "renderdoc-capture")]
- pub fn end_renderdoc_emulated_frame(&self) {
- if let Ok(mut rd) = self.renderdoc.lock() {
- rd.end_emulated_frame();
- }
- }
-
#[cfg(feature = "renderdoc-capture")]
pub fn capture_next_renderdoc_emulated_frame(&self) {
if let Ok(mut rd) = self.renderdoc.lock() {
diff --git a/crates/debugger/src/render.rs b/crates/debugger/src/render.rs
index 6b23f82..841b14a 100644
--- a/crates/debugger/src/render.rs
+++ b/crates/debugger/src/render.rs
@@ -107,17 +107,12 @@ impl RenderState {
debugger_ui.lua_log.extend(host.drain_logs());
}
- #[cfg(feature = "renderdoc-capture")]
- self.renderer.begin_renderdoc_emulated_frame();
-
debugger_ui.debugger.tick(emulator);
let frame = match self.surface.get_current_texture() {
wgpu::CurrentSurfaceTexture::Success(f) | wgpu::CurrentSurfaceTexture::Suboptimal(f) => f,
status => {
eprintln!("surface error: {status:?}");
- #[cfg(feature = "renderdoc-capture")]
- self.renderer.end_renderdoc_emulated_frame();
return;
}
};
@@ -397,9 +392,6 @@ impl RenderState {
#[cfg(feature = "renderdoc-capture")]
self.submit_swapchain_present_marker();
frame.present();
-
- #[cfg(feature = "renderdoc-capture")]
- self.renderer.end_renderdoc_emulated_frame();
}
#[cfg(feature = "renderdoc-capture")]
diff --git a/crates/tinyapp/src/app.rs b/crates/tinyapp/src/app.rs
index b6e478d..4cd4c7b 100644
--- a/crates/tinyapp/src/app.rs
+++ b/crates/tinyapp/src/app.rs
@@ -132,9 +132,6 @@ impl State {
}
fn render(&mut self, window: &Window, waiting: bool) {
- #[cfg(feature = "renderdoc-capture")]
- self.renderer.begin_renderdoc_emulated_frame();
-
if !waiting && let Some(intended) = self.intended_present_time {
let target = intended + self.pacer_offset;
let now = Instant::now();
@@ -326,9 +323,6 @@ impl State {
let next = (base + self.frame_period).max(now);
self.intended_present_time = Some(next);
}
-
- #[cfg(feature = "renderdoc-capture")]
- self.renderer.end_renderdoc_emulated_frame();
}
}