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

Don't blend if not target 1

This commit is contained in:
Jeffrey Pfau 2013-04-27 00:11:04 -07:00
parent f7922c1627
commit b3e1aa7853
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gba/renderers/video-software.c
View File

@ -335,7 +335,7 @@ static void _composite(struct GBAVideoSoftwareRenderer* renderer, int offset, ui
charBase = ((background->charBase + (mapData.tile << 5)) >> 1) + (localY << 1) + ((localX >> 2) & 1); \ charBase = ((background->charBase + (mapData.tile << 5)) >> 1) + (localY << 1) + ((localX >> 2) & 1); \
uint16_t tileData = renderer->d.vram[charBase]; \ uint16_t tileData = renderer->d.vram[charBase]; \
tileData >>= (localX & 0x3) << 2; \ tileData >>= (localX & 0x3) << 2; \
if (renderer->blendEffect == BLEND_NONE || renderer->blendEffect == BLEND_ALPHA) { \ if (!background->target1 || renderer->blendEffect == BLEND_NONE || renderer->blendEffect == BLEND_ALPHA) { \
color = renderer->d.palette[(tileData & 0xF) | (mapData.palette << 4)]; \ color = renderer->d.palette[(tileData & 0xF) | (mapData.palette << 4)]; \
} else { \ } else { \
color = renderer->variantPalette[(tileData & 0xF) | (mapData.palette << 4)]; \ color = renderer->variantPalette[(tileData & 0xF) | (mapData.palette << 4)]; \
@ -351,7 +351,7 @@ static void _composite(struct GBAVideoSoftwareRenderer* renderer, int offset, ui
charBase = ((background->charBase + (mapData.tile << 6)) >> 1) + (localY << 2) + ((localX >> 1) & 3); \ charBase = ((background->charBase + (mapData.tile << 6)) >> 1) + (localY << 2) + ((localX >> 1) & 3); \
uint16_t tileData = renderer->d.vram[charBase]; \ uint16_t tileData = renderer->d.vram[charBase]; \
tileData >>= (localX & 0x1) << 3; \ tileData >>= (localX & 0x1) << 3; \
if (renderer->blendEffect == BLEND_NONE || renderer->blendEffect == BLEND_ALPHA) { \ if (!background->target1 || renderer->blendEffect == BLEND_NONE || renderer->blendEffect == BLEND_ALPHA) { \
color = renderer->d.palette[tileData & 0xFF]; \ color = renderer->d.palette[tileData & 0xFF]; \
} else if (renderer->blendEffect == BLEND_DARKEN) { \ } else if (renderer->blendEffect == BLEND_DARKEN) { \
color = _darken(renderer->d.palette[tileData & 0xFF], renderer->bldy); \ color = _darken(renderer->d.palette[tileData & 0xFF], renderer->bldy); \