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

GBA Video: Extended regions for sprites

This commit is contained in:
Vicki Pfau 2017-02-22 23:47:44 -08:00
parent a60f3592d1
commit 76885a1c17
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@ static void DSVideoSoftwareRendererDeinit(struct DSVideoRenderer* renderer) {
softwareRenderer->engB.d.deinit(&softwareRenderer->engB.d); softwareRenderer->engB.d.deinit(&softwareRenderer->engB.d);
} }
static void GBAVideoSoftwareRendererUpdateDISPCNTA(struct DSVideoSoftwareRenderer* softwareRenderer) { static void DSVideoSoftwareRendererUpdateDISPCNTA(struct DSVideoSoftwareRenderer* softwareRenderer) {
uint16_t fakeDispcnt = softwareRenderer->dispcntA & 0xFF87; uint16_t fakeDispcnt = softwareRenderer->dispcntA & 0xFF87;
if (!DSRegisterDISPCNTIsTileObjMapping(softwareRenderer->dispcntA)) { if (!DSRegisterDISPCNTIsTileObjMapping(softwareRenderer->dispcntA)) {
softwareRenderer->engA.tileStride = 0x20; softwareRenderer->engA.tileStride = 0x20;
@ -72,9 +72,26 @@ static void GBAVideoSoftwareRendererUpdateDISPCNTA(struct DSVideoSoftwareRendere
fakeDispcnt = GBARegisterDISPCNTFillObjCharacterMapping(fakeDispcnt); fakeDispcnt = GBARegisterDISPCNTFillObjCharacterMapping(fakeDispcnt);
} }
softwareRenderer->engA.d.writeVideoRegister(&softwareRenderer->engA.d, DS9_REG_A_DISPCNT_LO, fakeDispcnt); softwareRenderer->engA.d.writeVideoRegister(&softwareRenderer->engA.d, DS9_REG_A_DISPCNT_LO, fakeDispcnt);
} uint32_t charBase = DSRegisterDISPCNTGetCharBase(softwareRenderer->dispcntA) << 16;
uint32_t screenBase = DSRegisterDISPCNTGetScreenBase(softwareRenderer->dispcntA) << 16;
softwareRenderer->engA.bg[0].charBase &= ~0x70000;
softwareRenderer->engA.bg[0].charBase |= charBase;
softwareRenderer->engA.bg[0].screenBase &= ~0x70000;
softwareRenderer->engA.bg[0].screenBase |= screenBase;
softwareRenderer->engA.bg[1].charBase &= ~0x70000;
softwareRenderer->engA.bg[1].charBase |= charBase;
softwareRenderer->engA.bg[1].screenBase &= ~0x70000;
softwareRenderer->engA.bg[1].screenBase |= screenBase;
softwareRenderer->engA.bg[2].charBase &= ~0x70000;
softwareRenderer->engA.bg[2].charBase |= charBase;
softwareRenderer->engA.bg[2].screenBase &= ~0x70000;
softwareRenderer->engA.bg[2].screenBase |= screenBase;
softwareRenderer->engA.bg[3].charBase &= ~0x70000;
softwareRenderer->engA.bg[3].charBase |= charBase;
softwareRenderer->engA.bg[3].screenBase &= ~0x70000;
softwareRenderer->engA.bg[3].screenBase |= screenBase;}
static void GBAVideoSoftwareRendererUpdateDISPCNTB(struct DSVideoSoftwareRenderer* softwareRenderer) { static void DSVideoSoftwareRendererUpdateDISPCNTB(struct DSVideoSoftwareRenderer* softwareRenderer) {
uint16_t fakeDispcnt = softwareRenderer->dispcntB & 0xFF87; uint16_t fakeDispcnt = softwareRenderer->dispcntB & 0xFF87;
if (!DSRegisterDISPCNTIsTileObjMapping(softwareRenderer->dispcntB)) { if (!DSRegisterDISPCNTIsTileObjMapping(softwareRenderer->dispcntB)) {
softwareRenderer->engB.tileStride = 0x20; softwareRenderer->engB.tileStride = 0x20;
@ -98,22 +115,22 @@ static uint16_t DSVideoSoftwareRendererWriteVideoRegister(struct DSVideoRenderer
case DS9_REG_A_DISPCNT_LO: case DS9_REG_A_DISPCNT_LO:
softwareRenderer->dispcntA &= 0xFFFF0000; softwareRenderer->dispcntA &= 0xFFFF0000;
softwareRenderer->dispcntA |= value; softwareRenderer->dispcntA |= value;
GBAVideoSoftwareRendererUpdateDISPCNTA(softwareRenderer); DSVideoSoftwareRendererUpdateDISPCNTA(softwareRenderer);
break; break;
case DS9_REG_A_DISPCNT_HI: case DS9_REG_A_DISPCNT_HI:
softwareRenderer->dispcntA &= 0x0000FFFF; softwareRenderer->dispcntA &= 0x0000FFFF;
softwareRenderer->dispcntA |= value << 16; softwareRenderer->dispcntA |= value << 16;
GBAVideoSoftwareRendererUpdateDISPCNTA(softwareRenderer); DSVideoSoftwareRendererUpdateDISPCNTA(softwareRenderer);
break; break;
case DS9_REG_B_DISPCNT_LO: case DS9_REG_B_DISPCNT_LO:
softwareRenderer->dispcntB &= 0xFFFF0000; softwareRenderer->dispcntB &= 0xFFFF0000;
softwareRenderer->dispcntB |= value; softwareRenderer->dispcntB |= value;
GBAVideoSoftwareRendererUpdateDISPCNTB(softwareRenderer); DSVideoSoftwareRendererUpdateDISPCNTB(softwareRenderer);
break; break;
case DS9_REG_B_DISPCNT_HI: case DS9_REG_B_DISPCNT_HI:
softwareRenderer->dispcntB &= 0x0000FFFF; softwareRenderer->dispcntB &= 0x0000FFFF;
softwareRenderer->dispcntB |= value << 16; softwareRenderer->dispcntB |= value << 16;
GBAVideoSoftwareRendererUpdateDISPCNTB(softwareRenderer); DSVideoSoftwareRendererUpdateDISPCNTB(softwareRenderer);
break; break;
case DS9_REG_POWCNT1: case DS9_REG_POWCNT1:
value &= 0x810F; value &= 0x810F;