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 6-bit PV stack pointer

This commit is contained in:
Vicki Pfau 2017-02-27 18:20:49 -08:00
parent 2ab7289a05
commit 64034e387f
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/mgba/internal/ds/gx.h
View File

@ -129,6 +129,7 @@ struct DSGX {
struct DSGXPolygon* polygonBuffer[2]; struct DSGXPolygon* polygonBuffer[2];
int mtxMode; int mtxMode;
int pvMatrixPointer;
struct DSGXMatrix projMatrixStack; struct DSGXMatrix projMatrixStack;
struct DSGXMatrix texMatrixStack; struct DSGXMatrix texMatrixStack;
struct DSGXMatrix posMatrixStack[32]; struct DSGXMatrix posMatrixStack[32];

22
src/ds/gx.c
View File

@ -151,7 +151,6 @@ static void _fifoRun(struct mTiming* timing, void* context, uint32_t cyclesLate)
} }
DSRegGXSTAT gxstat = gx->p->memory.io9[DS9_REG_GXSTAT_LO >> 1]; DSRegGXSTAT gxstat = gx->p->memory.io9[DS9_REG_GXSTAT_LO >> 1];
int pvMatrixPointer = DSRegGXSTATGetPVMatrixStackLevel(gxstat);
int projMatrixPointer = DSRegGXSTATGetProjMatrixStackLevel(gxstat); int projMatrixPointer = DSRegGXSTATGetProjMatrixStackLevel(gxstat);
struct DSGXEntry entry = { 0 }; struct DSGXEntry entry = { 0 };
@ -218,11 +217,11 @@ static void _fifoRun(struct mTiming* timing, void* context, uint32_t cyclesLate)
++projMatrixPointer; ++projMatrixPointer;
break; break;
case 2: case 2:
memcpy(&gx->vecMatrixStack[pvMatrixPointer & 0x1F], &gx->vecMatrix, sizeof(gx->vecMatrix)); memcpy(&gx->vecMatrixStack[gx->pvMatrixPointer & 0x1F], &gx->vecMatrix, sizeof(gx->vecMatrix));
// Fall through // Fall through
case 1: case 1:
memcpy(&gx->posMatrixStack[pvMatrixPointer & 0x1F], &gx->posMatrix, sizeof(gx->posMatrix)); memcpy(&gx->posMatrixStack[gx->pvMatrixPointer & 0x1F], &gx->posMatrix, sizeof(gx->posMatrix));
++pvMatrixPointer; ++gx->pvMatrixPointer;
break; break;
case 3: case 3:
mLOG(DS_GX, STUB, "Unimplemented GX MTX_PUSH mode"); mLOG(DS_GX, STUB, "Unimplemented GX MTX_PUSH mode");
@ -239,13 +238,13 @@ static void _fifoRun(struct mTiming* timing, void* context, uint32_t cyclesLate)
memcpy(&gx->projMatrix, &gx->projMatrixStack, sizeof(gx->projMatrix)); memcpy(&gx->projMatrix, &gx->projMatrixStack, sizeof(gx->projMatrix));
break; break;
case 1: case 1:
pvMatrixPointer -= offset; gx->pvMatrixPointer -= offset;
memcpy(&gx->posMatrix, &gx->posMatrixStack[pvMatrixPointer & 0x1F], sizeof(gx->posMatrix)); memcpy(&gx->posMatrix, &gx->posMatrixStack[gx->pvMatrixPointer & 0x1F], sizeof(gx->posMatrix));
break; break;
case 2: case 2:
pvMatrixPointer -= offset; gx->pvMatrixPointer -= offset;
memcpy(&gx->vecMatrix, &gx->vecMatrixStack[pvMatrixPointer & 0x1F], sizeof(gx->vecMatrix)); memcpy(&gx->vecMatrix, &gx->vecMatrixStack[gx->pvMatrixPointer & 0x1F], sizeof(gx->vecMatrix));
memcpy(&gx->posMatrix, &gx->posMatrixStack[pvMatrixPointer & 0x1F], sizeof(gx->posMatrix)); memcpy(&gx->posMatrix, &gx->posMatrixStack[gx->pvMatrixPointer & 0x1F], sizeof(gx->posMatrix));
break; break;
case 3: case 3:
mLOG(DS_GX, STUB, "Unimplemented GX MTX_POP mode"); mLOG(DS_GX, STUB, "Unimplemented GX MTX_POP mode");
@ -261,9 +260,9 @@ static void _fifoRun(struct mTiming* timing, void* context, uint32_t cyclesLate)
break; break;
} }
gxstat = DSRegGXSTATSetPVMatrixStackLevel(gxstat, pvMatrixPointer); gxstat = DSRegGXSTATSetPVMatrixStackLevel(gxstat, gx->pvMatrixPointer);
gxstat = DSRegGXSTATSetProjMatrixStackLevel(gxstat, projMatrixPointer); gxstat = DSRegGXSTATSetProjMatrixStackLevel(gxstat, projMatrixPointer);
gxstat = DSRegGXSTATTestFillMatrixStackError(gxstat, projMatrixPointer || pvMatrixPointer >= 0x1F); gxstat = DSRegGXSTATTestFillMatrixStackError(gxstat, projMatrixPointer || gx->pvMatrixPointer >= 0x1F);
gx->p->memory.io9[DS9_REG_GXSTAT_LO >> 1] = gxstat; gx->p->memory.io9[DS9_REG_GXSTAT_LO >> 1] = gxstat;
if (cyclesLate >= cycles) { if (cyclesLate >= cycles) {
@ -312,6 +311,7 @@ void DSGXReset(struct DSGX* gx) {
gx->swapBuffers = false; gx->swapBuffers = false;
gx->bufferIndex = 0; gx->bufferIndex = 0;
gx->mtxMode = 0; gx->mtxMode = 0;
gx->pvMatrixPointer = 0;
memset(gx->outstandingParams, 0, sizeof(gx->outstandingParams)); memset(gx->outstandingParams, 0, sizeof(gx->outstandingParams));
memset(gx->outstandingCommand, 0, sizeof(gx->outstandingCommand)); memset(gx->outstandingCommand, 0, sizeof(gx->outstandingCommand));