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

Re-add 256-color

This commit is contained in:
Jeffrey Pfau 2013-04-30 01:32:48 -07:00
parent 6cdfa43e97
commit 698bc0ada5
1 changed files with 110 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,6 +352,12 @@ static void _composite(struct GBAVideoSoftwareRenderer* renderer, int offset, ui
} \ } \
tileData >>= 4; tileData >>= 4;
#define BACKGROUND_DRAW_PIXEL_256 \
if (tileData & 0xFF && !renderer->flags[outX].finalized) { \
_composite(renderer, outX, renderer->normalPalette[tileData & 0xFF], flags); \
} \
tileData >>= 8;
#define BACKGROUND_TEXT_SELECT_CHARACTER \ #define BACKGROUND_TEXT_SELECT_CHARACTER \
localX = tileX * 8 + inX; \ localX = tileX * 8 + inX; \
xBase = localX & 0xF8; \ xBase = localX & 0xF8; \
@ -419,49 +425,113 @@ static void _drawBackgroundMode0(struct GBAVideoSoftwareRenderer* renderer, stru
outX = end; outX = end;
} }
for (tileX; tileX < 30; ++tileX) { if (!background->multipalette) {
BACKGROUND_TEXT_SELECT_CHARACTER; for (tileX; tileX < 30; ++tileX) {
charBase = ((background->charBase + (mapData.tile << 5)) >> 2) + localY; BACKGROUND_TEXT_SELECT_CHARACTER;
uint32_t tileData = ((uint32_t*)renderer->d.vram)[charBase]; charBase = ((background->charBase + (mapData.tile << 5)) >> 2) + localY;
if (tileData) { uint32_t tileData = ((uint32_t*)renderer->d.vram)[charBase];
if (!mapData.hflip) { if (tileData) {
BACKGROUND_DRAW_PIXEL_16; if (!mapData.hflip) {
++outX; BACKGROUND_DRAW_PIXEL_16;
BACKGROUND_DRAW_PIXEL_16; ++outX;
++outX; BACKGROUND_DRAW_PIXEL_16;
BACKGROUND_DRAW_PIXEL_16; ++outX;
++outX; BACKGROUND_DRAW_PIXEL_16;
BACKGROUND_DRAW_PIXEL_16; ++outX;
++outX; BACKGROUND_DRAW_PIXEL_16;
BACKGROUND_DRAW_PIXEL_16; ++outX;
++outX; BACKGROUND_DRAW_PIXEL_16;
BACKGROUND_DRAW_PIXEL_16; ++outX;
++outX; BACKGROUND_DRAW_PIXEL_16;
BACKGROUND_DRAW_PIXEL_16; ++outX;
++outX; BACKGROUND_DRAW_PIXEL_16;
BACKGROUND_DRAW_PIXEL_16; ++outX;
++outX; BACKGROUND_DRAW_PIXEL_16;
++outX;
} else {
outX += 7;
BACKGROUND_DRAW_PIXEL_16;
--outX;
BACKGROUND_DRAW_PIXEL_16;
--outX;
BACKGROUND_DRAW_PIXEL_16;
--outX;
BACKGROUND_DRAW_PIXEL_16;
--outX;
BACKGROUND_DRAW_PIXEL_16;
--outX;
BACKGROUND_DRAW_PIXEL_16;
--outX;
BACKGROUND_DRAW_PIXEL_16;
--outX;
BACKGROUND_DRAW_PIXEL_16;
outX += 8;
}
} else { } else {
outX += 7;
BACKGROUND_DRAW_PIXEL_16;
--outX;
BACKGROUND_DRAW_PIXEL_16;
--outX;
BACKGROUND_DRAW_PIXEL_16;
--outX;
BACKGROUND_DRAW_PIXEL_16;
--outX;
BACKGROUND_DRAW_PIXEL_16;
--outX;
BACKGROUND_DRAW_PIXEL_16;
--outX;
BACKGROUND_DRAW_PIXEL_16;
--outX;
BACKGROUND_DRAW_PIXEL_16;
outX += 8; outX += 8;
} }
} else { }
outX += 8; } else {
for (tileX; tileX < 30; ++tileX) {
BACKGROUND_TEXT_SELECT_CHARACTER;
charBase = ((background->charBase + (mapData.tile << 6)) >> 2) + (localY << 1);
if (!mapData.hflip) {
uint32_t tileData = ((uint32_t*)renderer->d.vram)[charBase];
if (tileData) {
BACKGROUND_DRAW_PIXEL_256;
++outX;
BACKGROUND_DRAW_PIXEL_256;
++outX;
BACKGROUND_DRAW_PIXEL_256;
++outX;
BACKGROUND_DRAW_PIXEL_256;
++outX;
} else {
outX += 4;
}
tileData = ((uint32_t*)renderer->d.vram)[charBase + 1];
if (tileData) {
BACKGROUND_DRAW_PIXEL_256;
++outX;
BACKGROUND_DRAW_PIXEL_256;
++outX;
BACKGROUND_DRAW_PIXEL_256;
++outX;
BACKGROUND_DRAW_PIXEL_256;
++outX;
} else {
outX += 4;
}
} else {
uint32_t tileData = ((uint32_t*)renderer->d.vram)[charBase + 1];
if (tileData) {
outX += 3;
BACKGROUND_DRAW_PIXEL_256;
--outX;
BACKGROUND_DRAW_PIXEL_256;
--outX;
BACKGROUND_DRAW_PIXEL_256;
--outX;
BACKGROUND_DRAW_PIXEL_256;
outX += 4;
} else {
outX += 4;
}
tileData = ((uint32_t*)renderer->d.vram)[charBase];
if (tileData) {
outX += 3;
BACKGROUND_DRAW_PIXEL_256;
--outX;
BACKGROUND_DRAW_PIXEL_256;
--outX;
BACKGROUND_DRAW_PIXEL_256;
--outX;
BACKGROUND_DRAW_PIXEL_256;
outX += 4;
} else {
outX += 4;
}
}
} }
} }
} }