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 depth test scaling

This commit is contained in:
Vicki Pfau 2020-07-28 16:03:10 -07:00
parent 656c3001ad
commit 2d8378ae95
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -21,6 +21,7 @@ Bugfixes:
- DS GX: Mask off invalid bits of the palette base - DS GX: Mask off invalid bits of the palette base
- DS: Properly close save file on close - DS: Properly close save file on close
- DS Video: Fix size of VRAM zeroes buffer - DS Video: Fix size of VRAM zeroes buffer
- DS GX: Fix depth test scaling
Misc: Misc:
- DS GX: Clean up and unify texture mapping - DS GX: Clean up and unify texture mapping
- DS Core: Add symbol loading - DS Core: Add symbol loading

8
src/ds/gx/software.c
View File

@ -478,7 +478,7 @@ static void _preparePoly(struct DSGXRenderer* renderer, struct DSGXVertex* verts
poly->texBase = &renderer->tex[DSGXTexParamsGetVRAMBase(poly->poly->texParams) >> VRAM_BLOCK_OFFSET][(DSGXTexParamsGetVRAMBase(poly->poly->texParams) << 2) & 0xFFFF]; poly->texBase = &renderer->tex[DSGXTexParamsGetVRAMBase(poly->poly->texParams) >> VRAM_BLOCK_OFFSET][(DSGXTexParamsGetVRAMBase(poly->poly->texParams) << 2) & 0xFFFF];
switch (poly->texFormat) { switch (poly->texFormat) {
case 0: case 0:
poly->texBase = NULL; poly->texBase = NULL;
break; break;
case 2: case 2:
if (renderer->texPal[poly->poly->palBase >> 11]) { if (renderer->texPal[poly->poly->palBase >> 11]) {
@ -648,7 +648,7 @@ static void _drawSpan(struct DSGXSoftwareRenderer* softwareRenderer, struct DSGX
stencilValue |= S_BIT_SHADOW; stencilValue |= S_BIT_SHADOW;
} }
for (; x < (span->ep[1].coord[0] >> 12) && x < DS_VIDEO_HORIZONTAL_PIXELS; ++x) { for (; x < (span->ep[1].coord[0] >> 12) && x < DS_VIDEO_HORIZONTAL_PIXELS; ++x) {
if (span->ep[0].coord[softwareRenderer->sort] < depth[x]) { if ((span->ep[0].coord[softwareRenderer->sort] >> 4) < depth[x]) {
_resolveEndpoint(span); _resolveEndpoint(span);
color_t color = _lookupColor(softwareRenderer, &span->ep[0], span->poly); color_t color = _lookupColor(softwareRenderer, &span->ep[0], span->poly);
unsigned a = color >> 27; unsigned a = color >> 27;
@ -661,7 +661,7 @@ static void _drawSpan(struct DSGXSoftwareRenderer* softwareRenderer, struct DSGX
} }
if (a == 0x1F) { if (a == 0x1F) {
// Opaque blending // Opaque blending
depth[x] = span->ep[0].coord[softwareRenderer->sort]; depth[x] = span->ep[0].coord[softwareRenderer->sort] >> 4;
scanline[x] = color; scanline[x] = color;
stencil[x] &= S_BIT_POLY_ID; stencil[x] &= S_BIT_POLY_ID;
stencil[x] |= s & S_BIT_POLY_SHADOW_ID; stencil[x] |= s & S_BIT_POLY_SHADOW_ID;
@ -675,7 +675,7 @@ static void _drawSpan(struct DSGXSoftwareRenderer* softwareRenderer, struct DSGX
if ((stencil[x] ^ s) & S_BIT_POLY_ID) { if ((stencil[x] ^ s) & S_BIT_POLY_ID) {
if (!(s & S_BIT_SHADOW) || (((stencil[x] ^ s) & S_BIT_POLY_SHADOW_ID) && s & S_BIT_POLY_SHADOW_ID && stencil[x] & S_BIT_SHADOW)) { if (!(s & S_BIT_SHADOW) || (((stencil[x] ^ s) & S_BIT_POLY_SHADOW_ID) && s & S_BIT_POLY_SHADOW_ID && stencil[x] & S_BIT_SHADOW)) {
if (DSGXPolygonAttrsIsUpdateDepth(span->poly->poly->polyParams)) { if (DSGXPolygonAttrsIsUpdateDepth(span->poly->poly->polyParams)) {
depth[x] = span->ep[0].coord[softwareRenderer->sort]; depth[x] = span->ep[0].coord[softwareRenderer->sort] >> 4;
} }
scanline[x] = color; scanline[x] = color;
stencil[x] &= S_BIT_POLY_SHADOW_ID; stencil[x] &= S_BIT_POLY_SHADOW_ID;