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

DS GX: Fix unpacking to a full FIFO

This commit is contained in:
Vicki Pfau 2017-03-08 22:55:59 -08:00
parent fd2869603a
commit 3c70b046dd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ds/gx.c
View File

@ -358,19 +358,16 @@ static void _emitVertex(struct DSGX* gx, uint16_t x, uint16_t y, uint16_t z) {
} }
static void _flushOutstanding(struct DSGX* gx) { static void _flushOutstanding(struct DSGX* gx) {
if (CircleBufferSize(&gx->fifo) == (DS_GX_FIFO_SIZE * sizeof(struct DSGXEntry))) {
return;
}
if (gx->p->cpuBlocked & DS_CPU_BLOCK_GX) { if (gx->p->cpuBlocked & DS_CPU_BLOCK_GX) {
gx->p->cpuBlocked &= ~DS_CPU_BLOCK_GX; gx->p->cpuBlocked &= ~DS_CPU_BLOCK_GX;
DSGXWriteFIFO(gx, gx->outstandingEntry); DSGXWriteFIFO(gx, gx->outstandingEntry);
gx->outstandingEntry.command = 0; gx->outstandingEntry.command = 0;
} }
while (gx->outstandingCommand[0] && !gx->outstandingParams[0]) { while (gx->outstandingCommand[0] && !gx->outstandingParams[0]) {
DSGXWriteFIFO(gx, (struct DSGXEntry) { 0 });
if (CircleBufferSize(&gx->fifo) == (DS_GX_FIFO_SIZE * sizeof(struct DSGXEntry))) { if (CircleBufferSize(&gx->fifo) == (DS_GX_FIFO_SIZE * sizeof(struct DSGXEntry))) {
return; return;
} }
DSGXWriteFIFO(gx, (struct DSGXEntry) { 0 });
} }
} }
@ -959,7 +956,9 @@ static void _fifoRun(struct mTiming* timing, void* context, uint32_t cyclesLate)
if (cycles && !gx->swapBuffers) { if (cycles && !gx->swapBuffers) {
mTimingSchedule(timing, &gx->fifoEvent, cycles - cyclesLate); mTimingSchedule(timing, &gx->fifoEvent, cycles - cyclesLate);
} }
_flushOutstanding(gx); if (CircleBufferSize(&gx->fifo) < (DS_GX_FIFO_SIZE * sizeof(struct DSGXEntry))) {
_flushOutstanding(gx);
}
DSGXUpdateGXSTAT(gx); DSGXUpdateGXSTAT(gx);
} }