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

GBA Video: Fix 256-color tiles

This commit is contained in:
Vicki Pfau 2017-03-18 17:12:54 -07:00
parent bd464ed123
commit 1a779ec2fa
1 changed files with 20 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/gba/renderers/software-mode0.c
View File

@ -40,7 +40,6 @@
for (outX = end - 1; outX >= renderer->start; --outX) { \ for (outX = end - 1; outX >= renderer->start; --outX) { \
BACKGROUND_DRAW_PIXEL_16(BLEND, OBJWIN, 0); \ BACKGROUND_DRAW_PIXEL_16(BLEND, OBJWIN, 0); \
} \ } \
outX = end; \
} \ } \
} }
@ -183,9 +182,9 @@
charBase = (background->charBase + (GBA_TEXT_MAP_TILE(mapData) << 6)) + (localY << 3); \ charBase = (background->charBase + (GBA_TEXT_MAP_TILE(mapData) << 6)) + (localY << 3); \
vram = renderer->d.vramBG[charBase >> VRAM_BLOCK_OFFSET]; \ vram = renderer->d.vramBG[charBase >> VRAM_BLOCK_OFFSET]; \
int end2 = end - 4; \ int end2 = end - 4; \
if (LIKELY(vram)) { \
if (!GBA_TEXT_MAP_HFLIP(mapData)) { \ if (!GBA_TEXT_MAP_HFLIP(mapData)) { \
int shift = inX & 0x3; \ int shift = inX & 0x3; \
if (LIKELY(vram)) { \
if (end2 > outX) { \ if (end2 > outX) { \
LOAD_32(tileData, charBase & VRAM_BLOCK_MASK, vram); \ LOAD_32(tileData, charBase & VRAM_BLOCK_MASK, vram); \
tileData >>= 8 * shift; \ tileData >>= 8 * shift; \
@ -194,19 +193,15 @@
BACKGROUND_DRAW_PIXEL_256(BLEND, OBJWIN, 0); \ BACKGROUND_DRAW_PIXEL_256(BLEND, OBJWIN, 0); \
} \ } \
} \ } \
} \
\ \
if (LIKELY(vram)) { \
LOAD_32(tileData, (charBase + 4) & VRAM_BLOCK_MASK, vram); \ LOAD_32(tileData, (charBase + 4) & VRAM_BLOCK_MASK, vram); \
tileData >>= 8 * shift; \ tileData >>= 8 * shift; \
for (; outX < end; ++outX) { \ for (; outX < end; ++outX) { \
BACKGROUND_DRAW_PIXEL_256(BLEND, OBJWIN, 0); \ BACKGROUND_DRAW_PIXEL_256(BLEND, OBJWIN, 0); \
} \ } \
} \
} else { \ } else { \
int start = outX; \ int start = outX; \
outX = end - 1; \ outX = end - 1; \
if (LIKELY(vram)) { \
if (end2 > start) { \ if (end2 > start) { \
LOAD_32(tileData, charBase & VRAM_BLOCK_MASK, vram); \ LOAD_32(tileData, charBase & VRAM_BLOCK_MASK, vram); \
for (; outX >= end2; --outX) { \ for (; outX >= end2; --outX) { \
@ -214,15 +209,12 @@
} \ } \
charBase += 4; \ charBase += 4; \
} \ } \
} \
\ \
if (LIKELY(vram)) { \ LOAD_32(tileData, charBase & VRAM_BLOCK_MASK, vram); \
LOAD_32(tileData, charBase, vram); \
for (; outX >= renderer->start; --outX) { \ for (; outX >= renderer->start; --outX) { \
BACKGROUND_DRAW_PIXEL_256(BLEND, OBJWIN, 0); \ BACKGROUND_DRAW_PIXEL_256(BLEND, OBJWIN, 0); \
} \ } \
} \ } \
outX = end; \
} }
#define DRAW_BACKGROUND_MODE_0_TILE_PREFIX_256(BLEND, OBJWIN) \ #define DRAW_BACKGROUND_MODE_0_TILE_PREFIX_256(BLEND, OBJWIN) \
@ -356,14 +348,14 @@
} }
#define DRAW_BACKGROUND_MODE_0_TILE_SUFFIX_256EXT(BLEND, OBJWIN) \ #define DRAW_BACKGROUND_MODE_0_TILE_SUFFIX_256EXT(BLEND, OBJWIN) \
paletteData = GBA_TEXT_MAP_PALETTE(mapData) << 8; \
palette = &mainPalette[paletteData]; \
charBase = (background->charBase + (GBA_TEXT_MAP_TILE(mapData) << 6)) + (localY << 3); \ charBase = (background->charBase + (GBA_TEXT_MAP_TILE(mapData) << 6)) + (localY << 3); \
vram = renderer->d.vramBG[charBase >> VRAM_BLOCK_OFFSET]; \ vram = renderer->d.vramBG[charBase >> VRAM_BLOCK_OFFSET]; \
int end2 = end - 4; \ int end2 = end - 4; \
if (LIKELY(vram)) { \
paletteData = GBA_TEXT_MAP_PALETTE(mapData) << 8; \
palette = &mainPalette[paletteData]; \
if (!GBA_TEXT_MAP_HFLIP(mapData)) { \ if (!GBA_TEXT_MAP_HFLIP(mapData)) { \
int shift = inX & 0x3; \ int shift = inX & 0x3; \
if (LIKELY(vram)) { \
if (end2 > outX) { \ if (end2 > outX) { \
LOAD_32(tileData, charBase & VRAM_BLOCK_MASK, vram); \ LOAD_32(tileData, charBase & VRAM_BLOCK_MASK, vram); \
tileData >>= 8 * shift; \ tileData >>= 8 * shift; \
@ -372,19 +364,15 @@
BACKGROUND_DRAW_PIXEL_256(BLEND, OBJWIN, 0); \ BACKGROUND_DRAW_PIXEL_256(BLEND, OBJWIN, 0); \
} \ } \
} \ } \
} \
\ \
if (LIKELY(vram)) { \
LOAD_32(tileData, (charBase + 4) & VRAM_BLOCK_MASK, vram); \ LOAD_32(tileData, (charBase + 4) & VRAM_BLOCK_MASK, vram); \
tileData >>= 8 * shift; \ tileData >>= 8 * shift; \
for (; outX < end; ++outX) { \ for (; outX < end; ++outX) { \
BACKGROUND_DRAW_PIXEL_256(BLEND, OBJWIN, 0); \ BACKGROUND_DRAW_PIXEL_256(BLEND, OBJWIN, 0); \
} \ } \
} \
} else { \ } else { \
int start = outX; \ int start = outX; \
outX = end - 1; \ outX = end - 1; \
if (LIKELY(vram)) { \
if (end2 > start) { \ if (end2 > start) { \
LOAD_32(tileData, charBase & VRAM_BLOCK_MASK, vram); \ LOAD_32(tileData, charBase & VRAM_BLOCK_MASK, vram); \
for (; outX >= end2; --outX) { \ for (; outX >= end2; --outX) { \
@ -392,15 +380,12 @@
} \ } \
charBase += 4; \ charBase += 4; \
} \ } \
} \
\ \
if (LIKELY(vram)) { \ LOAD_32(tileData, charBase & VRAM_BLOCK_MASK, vram); \
LOAD_32(tileData, charBase, vram); \
for (; outX >= renderer->start; --outX) { \ for (; outX >= renderer->start; --outX) { \
BACKGROUND_DRAW_PIXEL_256(BLEND, OBJWIN, 0); \ BACKGROUND_DRAW_PIXEL_256(BLEND, OBJWIN, 0); \
} \ } \
} \ } \
outX = end; \
} }
#define DRAW_BACKGROUND_MODE_0_TILE_PREFIX_256EXT(BLEND, OBJWIN) \ #define DRAW_BACKGROUND_MODE_0_TILE_PREFIX_256EXT(BLEND, OBJWIN) \