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

DS Software: Fix blending and brightness on 3D layer

This commit is contained in:
Vicki Pfau 2017-03-19 07:55:10 -07:00
parent ce40b8a038
commit 2700736c78
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ds/renderers/software.c
View File

@ -396,16 +396,30 @@ static void DSVideoSoftwareRendererDrawGBAScanline(struct GBAVideoRenderer* rend
flags |= FLAG_TARGET_1 * (softwareRenderer->bg[0].target1 && softwareRenderer->blendEffect == BLEND_ALPHA && GBAWindowControlIsBlendEnable(softwareRenderer->currentWindow.packed)); flags |= FLAG_TARGET_1 * (softwareRenderer->bg[0].target1 && softwareRenderer->blendEffect == BLEND_ALPHA && GBAWindowControlIsBlendEnable(softwareRenderer->currentWindow.packed));
int x; int x;
for (x = softwareRenderer->start; x < softwareRenderer->end; ++x) { for (x = softwareRenderer->start; x < softwareRenderer->end; ++x) {
if (scanline[x] & 0xFC000000) { color_t color = scanline[x];
if (softwareRenderer->bg[0].target1) {
if (softwareRenderer->blendEffect == BLEND_DARKEN) {
color = _darken(color, softwareRenderer->bldy) | (color & 0xFF000000);
} else if (softwareRenderer->blendEffect == BLEND_BRIGHTEN) {
color = _brighten(color, softwareRenderer->bldy) | (color & 0xFF000000);
}
}
if (color & 0xFC000000) {
if ((scanline[x] >> 28) != 0xF) { if ((scanline[x] >> 28) != 0xF) {
// TODO: More precise values // TODO: More precise values
softwareRenderer->alphaA[x] = (scanline[x] >> 28) + 1; softwareRenderer->alphaA[x] = (color >> 28) + 1;
softwareRenderer->alphaB[x] = 0xF - (scanline[x] >> 28); softwareRenderer->alphaB[x] = 0xF - (color >> 28);
_compositeBlendNoObjwin(softwareRenderer, x, (scanline[x] & 0x00FFFFFF) | flags | FLAG_TARGET_1, softwareRenderer->row[x]); _compositeBlendNoObjwin(softwareRenderer, x, (color & 0x00FFFFFF) | flags | FLAG_TARGET_1, softwareRenderer->row[x]);
} else { } else {
_compositeNoBlendNoObjwin(softwareRenderer, x, (scanline[x] & 0x00FFFFFF) | flags, softwareRenderer->row[x]); if (!(flags & FLAG_TARGET_2)) {
softwareRenderer->alphaA[x] = 0x10; _compositeNoBlendNoObjwin(softwareRenderer, x, (color & 0x00FFFFFF) | flags, softwareRenderer->row[x]);
softwareRenderer->alphaB[x] = 0; softwareRenderer->alphaA[x] = 0x10;
softwareRenderer->alphaB[x] = 0;
} else if (softwareRenderer->row[x] & FLAG_TARGET_1) {
_compositeBlendNoObjwin(softwareRenderer, x, (color & 0x00FFFFFF) | flags, softwareRenderer->row[x]);
} else {
_compositeNoBlendNoObjwin(softwareRenderer, x, (color & 0x00FFFFFF) | flags, softwareRenderer->row[x]);
}
} }
} }
} }