Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

fix CP FIFO breakpoint at FIFO end never firing (fixes donkey kong country)

Layle08ca6ba11121
diff --git a/crates/backend-wgpu/src/shaders/common.wesl b/crates/backend-wgpu/src/shaders/common.wesl
index ddcaf62..ec90489 100644
--- a/crates/backend-wgpu/src/shaders/common.wesl
+++ b/crates/backend-wgpu/src/shaders/common.wesl
@@ -92,7 +92,7 @@ struct VsIn {
};
struct VsOut {
- @builtin(position) clip_pos: vec4<f32>,
+ @invariant @builtin(position) clip_pos: vec4<f32>,
@location(0) color: vec4<f32>,
@location(1) color1: vec4<f32>,
@location(2) uv0: vec3<f32>,
diff --git a/crates/gecko/src/flipper/cp.rs b/crates/gecko/src/flipper/cp.rs
index 55de587..279f7af 100644
--- a/crates/gecko/src/flipper/cp.rs
+++ b/crates/gecko/src/flipper/cp.rs
@@ -300,4 +300,14 @@ pub fn pump_fifo<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>) {
sys.cp.refresh_status();
refresh_interrupts(sys);
}
+
+ if consumed > 0
+ && sys.cp.control.bp_interrupt_enable()
+ && !sys.cp.status.bp_interrupt()
+ && sys.cp.fifo_rw_distance() == 0
+ && sys.cp.fifo_read_ptr() == sys.cp.fifo_bp()
+ {
+ sys.cp.status = sys.cp.status.with_bp_interrupt(true);
+ refresh_interrupts(sys);
+ }
}