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

DS Video: Fix extended mode 0 without extended palettes

This commit is contained in:
Vicki Pfau 2017-04-12 13:58:02 -07:00
parent cb0f95b070
commit 776f008c30
2 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -14,6 +14,7 @@ Bugfixes:
- DS Video: Fix blend bit on windows for 3D layer (fixes mgba.io/i/611) - DS Video: Fix blend bit on windows for 3D layer (fixes mgba.io/i/611)
- DS GX: Hack around writing to a full FIFO that has a swap pending (fixes mgba.io/i/608) - DS GX: Hack around writing to a full FIFO that has a swap pending (fixes mgba.io/i/608)
- DS Video: Enable overflow bit on extended affine modes - DS Video: Enable overflow bit on extended affine modes
- DS Video: Fix extended mode 0 without extended palettes
Misc: Misc:
- DS: Set boot complete bit in RAM on boot (fixes mgba.io/i/576, mgba.io/i/580, mgba.io/i/586) - DS: Set boot complete bit in RAM on boot (fixes mgba.io/i/576, mgba.io/i/580, mgba.io/i/586)
- DS Memory: Ensure DS9 I/O is 8-byte aligned - DS Memory: Ensure DS9 I/O is 8-byte aligned

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

@ -650,7 +650,13 @@ static void DSVideoSoftwareRendererPutPixels(struct DSVideoRenderer* renderer, s
localX = x; \ localX = x; \
localY = y; localY = y;
#define EXT_0_NO_MOSAIC(COORD) \ #define EXT_0_EXT_PAL \
paletteData = GBA_TEXT_MAP_PALETTE(mapData) << 8; \
palette = &mainPalette[paletteData];
#define EXT_0_PAL palette = mainPalette;
#define EXT_0_NO_MOSAIC(COORD, PAL) \
COORD \ COORD \
uint32_t screenBase = background->screenBase + (localX >> 10) + (((localY >> 6) & 0xFE0) << background->size); \ uint32_t screenBase = background->screenBase + (localX >> 10) + (((localY >> 6) & 0xFE0) << background->size); \
uint16_t* screenBlock = renderer->d.vramBG[screenBase >> VRAM_BLOCK_OFFSET]; \ uint16_t* screenBlock = renderer->d.vramBG[screenBase >> VRAM_BLOCK_OFFSET]; \
@ -658,8 +664,7 @@ static void DSVideoSoftwareRendererPutPixels(struct DSVideoRenderer* renderer, s
continue; \ continue; \
} \ } \
LOAD_16(mapData, screenBase & (VRAM_BLOCK_MASK - 1), screenBlock); \ LOAD_16(mapData, screenBase & (VRAM_BLOCK_MASK - 1), screenBlock); \
paletteData = GBA_TEXT_MAP_PALETTE(mapData) << 8; \ PAL; \
palette = &mainPalette[paletteData]; \
if (GBA_TEXT_MAP_VFLIP(mapData)) { \ if (GBA_TEXT_MAP_VFLIP(mapData)) { \
localY = 0x7FF - localY; \ localY = 0x7FF - localY; \
} \ } \
@ -673,38 +678,54 @@ static void DSVideoSoftwareRendererPutPixels(struct DSVideoRenderer* renderer, s
} \ } \
pixelData = ((uint8_t*) vram)[charBase & VRAM_BLOCK_MASK]; pixelData = ((uint8_t*) vram)[charBase & VRAM_BLOCK_MASK];
#define EXT_0_MOSAIC(COORD) \ #define EXT_0_MOSAIC(COORD, PAL) \
if (!mosaicWait) { \ if (!mosaicWait) { \
EXT_0_NO_MOSAIC(COORD) \ EXT_0_NO_MOSAIC(COORD, PAL) \
mosaicWait = mosaicH; \ mosaicWait = mosaicH; \
} else { \ } else { \
--mosaicWait; \ --mosaicWait; \
} }
#define EXT_0_LOOP(MOSAIC, COORD, BLEND, OBJWIN) \ #define EXT_0_LOOP(MOSAIC, COORD, PAL, BLEND, OBJWIN) \
for (outX = renderer->start, pixel = &renderer->row[outX]; outX < renderer->end; ++outX, ++pixel) { \ for (outX = renderer->start, pixel = &renderer->row[outX]; outX < renderer->end; ++outX, ++pixel) { \
x += background->dx; \ x += background->dx; \
y += background->dy; \ y += background->dy; \
\ \
uint32_t current = *pixel; \ uint32_t current = *pixel; \
MOSAIC(COORD) \ MOSAIC(COORD, PAL) \
if (pixelData) { \ if (pixelData) { \
COMPOSITE_256_ ## OBJWIN (BLEND, 0); \ COMPOSITE_256_ ## OBJWIN (BLEND, 0); \
} \ } \
} }
#define DRAW_BACKGROUND_EXT_0(BLEND, OBJWIN) \ #define DRAW_BACKGROUND_EXT_0(BLEND, OBJWIN) \
if (background->overflow) { \ if (background->extPalette) { \
if (mosaicH > 1) { \ if (background->overflow) { \
EXT_0_LOOP(EXT_0_MOSAIC, EXT_0_COORD_OVERFLOW, BLEND, OBJWIN); \ if (mosaicH > 1) { \
EXT_0_LOOP(EXT_0_MOSAIC, EXT_0_COORD_OVERFLOW, EXT_0_EXT_PAL, BLEND, OBJWIN); \
} else { \
EXT_0_LOOP(EXT_0_NO_MOSAIC, EXT_0_COORD_OVERFLOW, EXT_0_EXT_PAL, BLEND, OBJWIN); \
} \
} else { \ } else { \
EXT_0_LOOP(EXT_0_NO_MOSAIC, EXT_0_COORD_OVERFLOW, BLEND, OBJWIN); \ if (mosaicH > 1) { \
EXT_0_LOOP(EXT_0_MOSAIC, EXT_0_COORD_NO_OVERFLOW, EXT_0_EXT_PAL, BLEND, OBJWIN); \
} else { \
EXT_0_LOOP(EXT_0_NO_MOSAIC, EXT_0_COORD_NO_OVERFLOW, EXT_0_EXT_PAL, BLEND, OBJWIN); \
} \
} \ } \
} else { \ } else { \
if (mosaicH > 1) { \ if (background->overflow) { \
EXT_0_LOOP(EXT_0_MOSAIC, EXT_0_COORD_NO_OVERFLOW, BLEND, OBJWIN); \ if (mosaicH > 1) { \
EXT_0_LOOP(EXT_0_MOSAIC, EXT_0_COORD_OVERFLOW, EXT_0_PAL, BLEND, OBJWIN); \
} else { \
EXT_0_LOOP(EXT_0_NO_MOSAIC, EXT_0_COORD_OVERFLOW, EXT_0_PAL, BLEND, OBJWIN); \
} \
} else { \ } else { \
EXT_0_LOOP(EXT_0_NO_MOSAIC, EXT_0_COORD_NO_OVERFLOW, BLEND, OBJWIN); \ if (mosaicH > 1) { \
EXT_0_LOOP(EXT_0_MOSAIC, EXT_0_COORD_NO_OVERFLOW, EXT_0_PAL, BLEND, OBJWIN); \
} else { \
EXT_0_LOOP(EXT_0_NO_MOSAIC, EXT_0_COORD_NO_OVERFLOW, EXT_0_PAL, BLEND, OBJWIN); \
} \
} \ } \
} }
@ -718,7 +739,10 @@ void DSVideoSoftwareRendererDrawBackgroundExt0(struct GBAVideoSoftwareRenderer*
mainPalette = background->variantPalette; mainPalette = background->variantPalette;
} }
if (!mainPalette) { if (!mainPalette) {
return; mainPalette = renderer->normalPalette;
if (variant) {
mainPalette = renderer->variantPalette;
}
} }
int paletteData; int paletteData;