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

DS GX: Fix bitmap textures when no palette is mapped (fixes #628)

This commit is contained in:
Vicki Pfau 2017-04-12 18:15:05 -07:00
parent 054f5a996c
commit b80e06f9bd
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -17,6 +17,7 @@ Bugfixes:
- 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

4
src/ds/gx/software.c
View File

@ -458,18 +458,18 @@ static void _preparePoly(struct DSGXRenderer* renderer, struct DSGXVertex* verts
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;