diff --git a/src/emulator.c b/src/emulator.c index 73fcdab4..d61b0ef1 100644 --- a/src/emulator.c +++ b/src/emulator.c @@ -336,7 +336,9 @@ static void emu_start_tracing(struct emu *emu) { /* * dreamcast guest interface */ -static void emu_vertical_blank(void *userdata) { +static void emu_vblank_in(void *userdata) {} + +static void emu_vblank_out(void *userdata) { struct emu *emu = userdata; emu->frame++; @@ -735,7 +737,8 @@ struct emu *emu_create(struct host *host) { emu->dc->push_audio = &emu_push_audio; emu->dc->start_render = &emu_start_render; emu->dc->finish_render = &emu_finish_render; - emu->dc->vertical_blank = &emu_vertical_blank; + emu->dc->vblank_in = &emu_vblank_in; + emu->dc->vblank_out = &emu_vblank_out; /* add all textures to free list by default */ for (int i = 0; i < ARRAY_SIZE(emu->textures); i++) { diff --git a/src/guest/dreamcast.c b/src/guest/dreamcast.c index b96e1966..eb0ce584 100644 --- a/src/guest/dreamcast.c +++ b/src/guest/dreamcast.c @@ -15,12 +15,20 @@ #include "guest/scheduler.h" #include "guest/sh4/sh4.h" -void dc_vertical_blank(struct dreamcast *dc) { - if (!dc->vertical_blank) { +void dc_vblank_out(struct dreamcast *dc) { + if (!dc->vblank_out) { return; } - dc->vertical_blank(dc->userdata); + dc->vblank_out(dc->userdata); +} + +void dc_vblank_in(struct dreamcast *dc) { + if (!dc->vblank_in) { + return; + } + + dc->vblank_in(dc->userdata); } void dc_finish_render(struct dreamcast *dc) { diff --git a/src/guest/dreamcast.h b/src/guest/dreamcast.h index 56b8117c..26b2175c 100644 --- a/src/guest/dreamcast.h +++ b/src/guest/dreamcast.h @@ -135,7 +135,7 @@ struct device { typedef void (*push_audio_cb)(void *, const int16_t *, int); typedef void (*start_render_cb)(void *, struct ta_context *); typedef void (*finish_render_cb)(void *); -typedef void (*vertical_blank_cb)(void *); +typedef void (*vblank_cb)(void *); struct dreamcast { int running; @@ -164,7 +164,8 @@ struct dreamcast { push_audio_cb push_audio; start_render_cb start_render; finish_render_cb finish_render; - vertical_blank_cb vertical_blank; + vblank_cb vblank_in; + vblank_cb vblank_out; }; struct dreamcast *dc_create(); @@ -203,6 +204,7 @@ void dc_input(struct dreamcast *dc, int port, int button, int16_t value); void dc_push_audio(struct dreamcast *dc, const int16_t *data, int frames); void dc_start_render(struct dreamcast *dc, struct ta_context *ctx); void dc_finish_render(struct dreamcast *dc); -void dc_vertical_blank(struct dreamcast *dc); +void dc_vblank_in(struct dreamcast *dc); +void dc_vblank_out(struct dreamcast *dc); #endif diff --git a/src/guest/pvr/pvr.c b/src/guest/pvr/pvr.c index 6133952b..0f929e56 100644 --- a/src/guest/pvr/pvr.c +++ b/src/guest/pvr/pvr.c @@ -53,7 +53,9 @@ static void pvr_next_scanline(void *data) { /* FIXME toggle SPG_STATUS.fieldnum on vblank? */ if (!was_vsync && pvr->SPG_STATUS->vsync) { prof_counter_add(COUNTER_pvr_vblanks, 1); - dc_vertical_blank(pvr->dc); + dc_vblank_in(pvr->dc); + } else if (was_vsync && !pvr->SPG_STATUS->vsync) { + dc_vblank_out(pvr->dc); } /* reschedule */