ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GB Video: Frame end callback should only happen on instruction boundary

This commit is contained in:
Jeffrey Pfau 2016-05-28 10:50:17 -07:00
parent 334963511b
commit 2ee192d868
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/gb/video.c
View File

@ -50,6 +50,7 @@ void GBVideoReset(struct GBVideo* video) {
video->nextMode = INT_MAX; video->nextMode = INT_MAX;
video->dotCounter = INT_MIN; video->dotCounter = INT_MIN;
video->nextFrame = INT_MAX;
video->frameCounter = 0; video->frameCounter = 0;
video->frameskipCounter = 0; video->frameskipCounter = 0;
@ -88,6 +89,7 @@ int32_t GBVideoProcessEvents(struct GBVideo* video, int32_t cycles) {
if (video->nextEvent <= 0) { if (video->nextEvent <= 0) {
if (video->nextEvent != INT_MAX) { if (video->nextEvent != INT_MAX) {
video->nextMode -= video->eventDiff; video->nextMode -= video->eventDiff;
video->nextFrame -= video->eventDiff;
} }
video->nextEvent = INT_MAX; video->nextEvent = INT_MAX;
GBVideoProcessDots(video); GBVideoProcessDots(video);
@ -116,12 +118,10 @@ int32_t GBVideoProcessEvents(struct GBVideo* video, int32_t cycles) {
mCoreSyncPostFrame(video->p->sync); mCoreSyncPostFrame(video->p->sync);
video->frameskipCounter = video->frameskip; video->frameskipCounter = video->frameskip;
} }
GBFrameEnded(video->p);
++video->frameCounter; ++video->frameCounter;
struct mCoreThread* thread = mCoreThreadGet(); if (video->nextFrame != 0) {
if (thread && thread->frameCallback) { video->nextFrame = 0;
thread->frameCallback(thread);
} }
if (video->p->stream && video->p->stream->postVideoFrame) { if (video->p->stream && video->p->stream->postVideoFrame) {
@ -198,6 +198,21 @@ int32_t GBVideoProcessEvents(struct GBVideo* video, int32_t cycles) {
video->stat = GBRegisterSTATSetMode(video->stat, video->mode); video->stat = GBRegisterSTATSetMode(video->stat, video->mode);
video->p->memory.io[REG_STAT] = video->stat; video->p->memory.io[REG_STAT] = video->stat;
} }
if (video->nextFrame <= 0) {
if (video->p->cpu->executionState == LR35902_CORE_FETCH) {
GBFrameEnded(video->p);
struct mCoreThread* thread = mCoreThreadGet();
if (thread && thread->frameCallback) {
thread->frameCallback(thread);
}
video->nextFrame = GB_VIDEO_TOTAL_LENGTH;
} else {
video->nextFrame = 4 - ((video->p->cpu->executionState + 1) & 3);
if (video->nextFrame < video->nextEvent) {
video->nextEvent = video->nextFrame;
}
}
}
if (video->nextMode < video->nextEvent) { if (video->nextMode < video->nextEvent) {
video->nextEvent = video->nextMode; video->nextEvent = video->nextMode;
} }

2
src/gb/video.h
View File

@ -104,6 +104,8 @@ struct GBVideo {
int32_t nextMode; int32_t nextMode;
int32_t dotCounter; int32_t dotCounter;
int32_t nextFrame;
uint8_t* vram; uint8_t* vram;
uint8_t* vramBank; uint8_t* vramBank;
int vramCurrentBank; int vramCurrentBank;