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 parameter-less packed commands

This commit is contained in:
Vicki Pfau 2017-02-28 21:15:12 -08:00
parent 548be81751
commit 4073175409
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ds/gx.c
View File

@ -20,6 +20,8 @@ static void DSGXDummyRendererSetRAM(struct DSGXRenderer* renderer, struct DSGXVe
static void DSGXDummyRendererDrawScanline(struct DSGXRenderer* renderer, int y); static void DSGXDummyRendererDrawScanline(struct DSGXRenderer* renderer, int y);
static void DSGXDummyRendererGetScanline(struct DSGXRenderer* renderer, int y, color_t** output); static void DSGXDummyRendererGetScanline(struct DSGXRenderer* renderer, int y, color_t** output);
static void DSGXWriteFIFO(struct DSGX* gx, struct DSGXEntry entry);
static const int32_t _gxCommandCycleBase[DS_GX_CMD_MAX] = { static const int32_t _gxCommandCycleBase[DS_GX_CMD_MAX] = {
[DS_GX_CMD_NOP] = 0, [DS_GX_CMD_NOP] = 0,
[DS_GX_CMD_MTX_MODE] = 2, [DS_GX_CMD_MTX_MODE] = 2,
@ -759,17 +761,23 @@ static void DSGXUnpackCommand(struct DSGX* gx, uint32_t command) {
gx->outstandingParams[1] = _gxCommandParams[gx->outstandingCommand[1]]; gx->outstandingParams[1] = _gxCommandParams[gx->outstandingCommand[1]];
gx->outstandingParams[2] = _gxCommandParams[gx->outstandingCommand[2]]; gx->outstandingParams[2] = _gxCommandParams[gx->outstandingCommand[2]];
gx->outstandingParams[3] = _gxCommandParams[gx->outstandingCommand[3]]; gx->outstandingParams[3] = _gxCommandParams[gx->outstandingCommand[3]];
while (gx->outstandingCommand[0] && !gx->outstandingParams[0]) {
DSGXWriteFIFO(gx, (struct DSGXEntry) { 0 });
}
} }
static void DSGXWriteFIFO(struct DSGX* gx, struct DSGXEntry entry) { static void DSGXWriteFIFO(struct DSGX* gx, struct DSGXEntry entry) {
if (gx->outstandingParams[0]) { if (gx->outstandingCommand[0]) {
entry.command = gx->outstandingCommand[0]; entry.command = gx->outstandingCommand[0];
--gx->outstandingParams[0]; if (gx->outstandingParams[0]) {
--gx->outstandingParams[0];
}
if (!gx->outstandingParams[0]) { if (!gx->outstandingParams[0]) {
// TODO: improve this // TODO: improve this
memmove(&gx->outstandingParams[0], &gx->outstandingParams[1], sizeof(gx->outstandingParams[0]) * 3); memmove(&gx->outstandingParams[0], &gx->outstandingParams[1], sizeof(gx->outstandingParams[0]) * 3);
memmove(&gx->outstandingCommand[0], &gx->outstandingCommand[1], sizeof(gx->outstandingCommand[0]) * 3); memmove(&gx->outstandingCommand[0], &gx->outstandingCommand[1], sizeof(gx->outstandingCommand[0]) * 3);
gx->outstandingParams[3] = 0; gx->outstandingParams[3] = 0;
gx->outstandingCommand[3] = 0;
} }
} else { } else {
gx->outstandingCommand[0] = entry.command; gx->outstandingCommand[0] = entry.command;
@ -800,6 +808,10 @@ static void DSGXWriteFIFO(struct DSGX* gx, struct DSGXEntry entry) {
if (!gx->swapBuffers && !mTimingIsScheduled(&gx->p->ds9.timing, &gx->fifoEvent)) { if (!gx->swapBuffers && !mTimingIsScheduled(&gx->p->ds9.timing, &gx->fifoEvent)) {
mTimingSchedule(&gx->p->ds9.timing, &gx->fifoEvent, cycles); mTimingSchedule(&gx->p->ds9.timing, &gx->fifoEvent, cycles);
} }
if (gx->outstandingCommand[0] && !gx->outstandingParams[0]) {
DSGXWriteFIFO(gx, (struct DSGXEntry) { 0 });
}
} }
uint16_t DSGXWriteRegister(struct DSGX* gx, uint32_t address, uint16_t value) { uint16_t DSGXWriteRegister(struct DSGX* gx, uint32_t address, uint16_t value) {