all repos — mgba @ b80e06f9bd127e9ca83141766a40b767c2deb516

mGBA Game Boy Advance Emulator

DS GX: Fix bitmap textures when no palette is mapped (fixes #628)
Vicki Pfau vi@endrift.com
Wed, 12 Apr 2017 18:15:05 -0700
commit

b80e06f9bd127e9ca83141766a40b767c2deb516

parent

054f5a996c2b6a2b73b50cc7b62e29b4fde3100e

2 files changed, 3 insertions(+), 2 deletions(-)

jump to
M CHANGESCHANGES

@@ -17,6 +17,7 @@ - DS Video: Enable overflow bit on extended affine modes

- DS Video: Fix extended mode 0 without extended palettes - DS Video: Fix caputre stride - DS Video: Fix affine transformations in video capture + - DS GX: Fix bitmap textures when no palette is mapped (fixes mgba.io/i/628) Misc: - 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
M src/ds/gx/software.csrc/ds/gx/software.c

@@ -458,18 +458,18 @@ poly->texH = 8 << DSGXTexParamsGetTSize(poly->texParams);

poly->texBase = NULL; poly->palBase = NULL; if (renderer->tex[DSGXTexParamsGetVRAMBase(poly->texParams) >> VRAM_BLOCK_OFFSET]) { + poly->texBase = &renderer->tex[DSGXTexParamsGetVRAMBase(poly->poly->texParams) >> VRAM_BLOCK_OFFSET][(DSGXTexParamsGetVRAMBase(poly->poly->texParams) << 2) & 0xFFFF]; switch (poly->texFormat) { case 0: + poly->texBase = NULL; break; case 2: if (renderer->texPal[poly->poly->palBase >> 11]) { - poly->texBase = &renderer->tex[DSGXTexParamsGetVRAMBase(poly->poly->texParams) >> VRAM_BLOCK_OFFSET][(DSGXTexParamsGetVRAMBase(poly->poly->texParams) << 2) & 0xFFFF]; poly->palBase = &renderer->texPal[poly->poly->palBase >> 11][(poly->poly->palBase << 2) & 0x1FFF]; } break; default: if (renderer->texPal[poly->poly->palBase >> 10]) { - poly->texBase = &renderer->tex[DSGXTexParamsGetVRAMBase(poly->poly->texParams) >> VRAM_BLOCK_OFFSET][(DSGXTexParamsGetVRAMBase(poly->poly->texParams) << 2) & 0xFFFF]; poly->palBase = &renderer->texPal[poly->poly->palBase >> 10][(poly->poly->palBase << 3) & 0x1FFF]; } break;