mirror/psxrecomp
1
0
Fork 0
mirror of https://github.com/RetroPortingToolKit/psxrecomp synced 2026-10-26 02:11:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Preserve explicit GPU hold output state before the first held VBlank

Browse Source
This commit is contained in:
Matthew Stanley
2026-10-14 11:19:53 -07:00
parent ca667e0d2d
commit 70269e5b4e
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/gpu.c
+7 -4
View File
@@ -7886,7 +7886,7 @@ static int gpu_snap_emit(PstW *w) {
WI(vram_read_active); WH(vram_read_x); WH(vram_read_y); WH(vram_read_w); WH(vram_read_h);
WH(vram_read_col); WH(vram_read_row);
/* Depth24 present helpers (MotK FMV) — must resume with upload span. */
WU(s_d24_upload_x1); WI(s_d24_present_hold | (s_d24_present_skip ? 0x100 : 0));
WU(s_d24_upload_x1); WI(s_d24_present_hold | 0x200 | (s_d24_present_skip ? 0x100 : 0));
WU(s_d24_prev_disp_h);
#undef WU
#undef WI
@@ -7921,9 +7921,12 @@ static int gpu_snap_parse(PstR *r) {
RI(vram_read_active); RH(vram_read_x); RH(vram_read_y); RH(vram_read_w); RH(vram_read_h);
RH(vram_read_col); RH(vram_read_row);
RU(s_d24_upload_x1); RI(s_d24_present_hold); RU(s_d24_prev_disp_h);
/* Bit 8: the latest VBlank was held. Older snaps lack it; a positive
* count after a VBlank implies the VBlank was held. */
s_d24_present_skip = (s_d24_present_hold & 0x100) || (s_d24_present_hold & 0xFF) > 0;
/* Bit 9 marks an explicit skip flag (bit 8). GP1 can arm a positive
* count before VBlank, when skip is still false: that state must round
* trip exactly. Older snaps without the marker infer skip from count. */
s_d24_present_skip = (s_d24_present_hold & 0x200)
? (s_d24_present_hold & 0x100) != 0
: (s_d24_present_hold & 0x100) || (s_d24_present_hold & 0xFF) > 0;
s_d24_present_hold &= 0xFF;
#undef RU
#undef RI
runtime/tests/test_depth24_present_hold_exec.c
+16
View File
@@ -312,7 +312,23 @@ static void check_rollback_and_disk(void) {
assert(r == live[RETARGET_1 + 3].presented && h == live[RETARGET_1 + 3].frame_hash);
}
static void check_pre_vblank_snapshot(void) {
reset_gpu();
for (int f = 0; f < RETARGET_1; f++) { guest_frame(f); gpu_vblank_tick(); }
guest_frame(RETARGET_1); /* GP1 arms a count before the first held VBlank. */
assert(s_d24_present_hold == 3 && s_d24_present_skip == 0);
const uint32_t n = gpu_snapshot_bytes();
uint8_t *snap = (uint8_t *)malloc(n);
assert(snap);
gpu_snapshot_write(snap);
s_d24_present_hold = s_d24_present_skip = 0;
assert(gpu_snapshot_read(snap, n));
assert(s_d24_present_hold == 3 && s_d24_present_skip == 0);
free(snap);
}
int main(void) {
check_pre_vblank_snapshot();
check_policies_agree();
check_hold_is_needed();
check_rollback_and_disk();