Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

fix multiple fifo debugger issues reported by liy

Layle64428c02e2dc
diff --git a/crates/backend-wgpu/src/lib.rs b/crates/backend-wgpu/src/lib.rs
index e398e2f..2f3fc19 100644
--- a/crates/backend-wgpu/src/lib.rs
+++ b/crates/backend-wgpu/src/lib.rs
@@ -895,6 +895,27 @@ impl GxRenderer {
self.submit_pending(queue);
}
+ pub fn reset_efb(&mut self, device: &wgpu::Device, queue: &wgpu::Queue) {
+ self.flush_pending_draws(device, queue);
+ self.submit_pending(queue);
+
+ self.clear_efb_region(
+ device,
+ queue,
+ 0,
+ 0,
+ EFB_WIDTH,
+ EFB_HEIGHT,
+ [0.0, 0.0, 0.0, 0.0],
+ 1.0,
+ true,
+ true,
+ true,
+ );
+
+ self.submit_pending(queue);
+ }
+
pub fn efb_view(&self) -> &wgpu::TextureView {
&self.efb_view
}
diff --git a/crates/backend-wgpu/src/sink.rs b/crates/backend-wgpu/src/sink.rs
index 6f63f0d..d0d07e6 100644
--- a/crates/backend-wgpu/src/sink.rs
+++ b/crates/backend-wgpu/src/sink.rs
@@ -289,6 +289,10 @@ impl RenderSink for InlineSink {
.drain_pending_writebacks(&self.device, &self.queue, ram);
}
+ fn reset_efb(&mut self) {
+ self.gx.lock().unwrap().reset_efb(&self.device, &self.queue);
+ }
+
fn take_draw_data(&mut self) -> Box<DrawData> {
self.recycled_draw_data.pop().unwrap_or_default()
}
diff --git a/crates/fifoplayer/src/debug.rs b/crates/fifoplayer/src/debug.rs
index 931bedc..0af515a 100644
--- a/crates/fifoplayer/src/debug.rs
+++ b/crates/fifoplayer/src/debug.rs
@@ -307,6 +307,7 @@ impl<const SYSTEM: SystemId> DebugSession<SYSTEM> {
self.finished = false;
self.sink.exec(GxAction::InvalidateCaches);
+ self.sink.reset_efb();
self.playback.load_state(&self.file, &mut self.sink);
for f in self.start..frame {
diff --git a/crates/fifoplayer/src/debug/ui.rs b/crates/fifoplayer/src/debug/ui.rs
index dd29ec9..d2efd23 100644
--- a/crates/fifoplayer/src/debug/ui.rs
+++ b/crates/fifoplayer/src/debug/ui.rs
@@ -951,7 +951,7 @@ impl<const SYSTEM: SystemId> DebugApp<SYSTEM> {
let show_xfb = match self.view_mode {
ViewMode::Xfb => true,
ViewMode::Efb => false,
- ViewMode::Auto => self.session.row == 0 && self.session.presents > 0,
+ ViewMode::Auto => (self.session.row == 0 || self.session.finished) && self.session.presents > 0,
};
let (tex, size, label) = if show_xfb {
diff --git a/crates/fifoplayer/src/playback.rs b/crates/fifoplayer/src/playback.rs
index 18f2c60..847ae35 100644
--- a/crates/fifoplayer/src/playback.rs
+++ b/crates/fifoplayer/src/playback.rs
@@ -36,6 +36,10 @@ impl RenderSink for PlayerSink {
self.inner.flush_efb_copies(ram);
}
+ fn reset_efb(&mut self) {
+ self.inner.reset_efb();
+ }
+
fn take_draw_data(&mut self) -> Box<DrawData> {
self.inner.take_draw_data()
}
diff --git a/crates/gecko/src/host.rs b/crates/gecko/src/host.rs
index 3a6be4e..9b08dcc 100644
--- a/crates/gecko/src/host.rs
+++ b/crates/gecko/src/host.rs
@@ -235,6 +235,9 @@ pub trait RenderSink: Send {
let _ = ram;
}
+ /// Clear the embedded framebuffer back to a fresh (empty) state.
+ fn reset_efb(&mut self) {}
+
/// Acquire a `DrawData` box for the next draw call. The default impl
/// allocates fresh. Real renderers override to recycle boxes that come
/// back through [`Self::exec`] as `GxAction::Draw(box)`. The caller