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 alpha blending

This commit is contained in:
Vicki Pfau 2017-03-13 15:35:24 -07:00
parent be1c144513
commit 87867908b7
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -537,21 +537,31 @@ static void DSGXSoftwareRendererDrawScanline(struct DSGXRenderer* renderer, int
_lerpEndpoint(span, &ep, x); _lerpEndpoint(span, &ep, x);
color_t color = _lookupColor(softwareRenderer, &ep, span->poly); color_t color = _lookupColor(softwareRenderer, &ep, span->poly);
unsigned a = color >> 27; unsigned a = color >> 27;
unsigned current = scanline[x];
unsigned b = current >> 27;
unsigned ab = a;
if (b > ab) {
ab = b;
}
if (a == 0x1F) { if (a == 0x1F) {
if (softwareRenderer->wSort) { if (softwareRenderer->wSort) {
if (ep.w < softwareRenderer->depthBuffer[x]) { if (ep.w < softwareRenderer->depthBuffer[x]) {
softwareRenderer->depthBuffer[x] = ep.w; softwareRenderer->depthBuffer[x] = ep.w;
scanline[x] = color; scanline[x] = color;
} else if (b < 0x1F) {
scanline[x] = _mix32(b, scanline[x], 0x1F - b, color) | a << 27;
} }
} else { } else {
if (ep.z < softwareRenderer->depthBuffer[x]) { if (ep.z < softwareRenderer->depthBuffer[x]) {
softwareRenderer->depthBuffer[x] = ep.z; softwareRenderer->depthBuffer[x] = ep.z;
scanline[x] = color; scanline[x] = color;
} else if (b < 0x1F) {
scanline[x] = _mix32(b, scanline[x], 0x1F - b, color) | a << 27;
} }
} }
} else if (a) { } else if (a) {
// TODO: Disable alpha? // TODO: Disable alpha?
color = _mix32(a, color, 0x1F - a, scanline[x]); color = _mix32(a, color, 0x1F - a, current);
if (scanline[x] >> 27 > a) { if (scanline[x] >> 27 > a) {
a = scanline[x] >> 27; a = scanline[x] >> 27;
} }
@ -560,11 +570,15 @@ static void DSGXSoftwareRendererDrawScanline(struct DSGXRenderer* renderer, int
if (ep.w < softwareRenderer->depthBuffer[x]) { if (ep.w < softwareRenderer->depthBuffer[x]) {
softwareRenderer->depthBuffer[x] = ep.w; softwareRenderer->depthBuffer[x] = ep.w;
scanline[x] = color; scanline[x] = color;
} else if (b < 0x1F) {
scanline[x] = _mix32(b, scanline[x], 0x1F - b, color) | ab << 27;
} }
} else { } else {
if (ep.z < softwareRenderer->depthBuffer[x]) { if (ep.z < softwareRenderer->depthBuffer[x]) {
softwareRenderer->depthBuffer[x] = ep.z; softwareRenderer->depthBuffer[x] = ep.z;
scanline[x] = color; scanline[x] = color;
} else if (b < 0x1F) {
scanline[x] = _mix32(b, scanline[x], 0x1F - b, color) | ab << 27;
} }
} }
} }