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

GB Video: Increment BCPS/OCPS even in mode 3 (fixes #1462)

This commit is contained in:
Vicki Pfau 2019-06-24 09:05:38 -07:00
parent fb72b70505
commit 06d407f130
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -27,6 +27,7 @@ Emulation fixes:
- GBA Memory: Fix STM to VRAM (fixes mgba.io/i/1430) - GBA Memory: Fix STM to VRAM (fixes mgba.io/i/1430)
- GB Audio: Only reset channel 3 sample in DMG mode - GB Audio: Only reset channel 3 sample in DMG mode
- GB Audio: Sample inactive channels (fixes mgba.io/i/1455, mgba.io/i/1456) - GB Audio: Sample inactive channels (fixes mgba.io/i/1455, mgba.io/i/1456)
- GB Video: Increment BCPS/OCPS even in mode 3 (fixes mgba.io/i/1462)
Other fixes: Other fixes:
- Qt: Fix some Qt display driver race conditions - Qt: Fix some Qt display driver race conditions
- Core: Improved lockstep driver reliability (Le Hoang Quyen) - Core: Improved lockstep driver reliability (Le Hoang Quyen)

4
src/gb/io.c
View File

@ -499,8 +499,8 @@ void GBIOWrite(struct GB* gb, unsigned address, uint8_t value) {
case REG_BCPD: case REG_BCPD:
if (gb->video.mode != 3) { if (gb->video.mode != 3) {
GBVideoProcessDots(&gb->video, 0); GBVideoProcessDots(&gb->video, 0);
GBVideoWritePalette(&gb->video, address, value);
} }
GBVideoWritePalette(&gb->video, address, value);
return; return;
case REG_OCPS: case REG_OCPS:
gb->video.ocpIndex = value & 0x3F; gb->video.ocpIndex = value & 0x3F;
@ -510,8 +510,8 @@ void GBIOWrite(struct GB* gb, unsigned address, uint8_t value) {
case REG_OCPD: case REG_OCPD:
if (gb->video.mode != 3) { if (gb->video.mode != 3) {
GBVideoProcessDots(&gb->video, 0); GBVideoProcessDots(&gb->video, 0);
GBVideoWritePalette(&gb->video, address, value);
} }
GBVideoWritePalette(&gb->video, address, value);
return; return;
case REG_SVBK: case REG_SVBK:
GBMemorySwitchWramBank(&gb->memory, value); GBMemorySwitchWramBank(&gb->memory, value);

32
src/gb/video.c
View File

@ -505,14 +505,16 @@ void GBVideoWritePalette(struct GBVideo* video, uint16_t address, uint8_t value)
} else { } else {
switch (address) { switch (address) {
case REG_BCPD: case REG_BCPD:
if (video->bcpIndex & 1) { if (video->mode != 3) {
video->palette[video->bcpIndex >> 1] &= 0x00FF; if (video->bcpIndex & 1) {
video->palette[video->bcpIndex >> 1] |= value << 8; video->palette[video->bcpIndex >> 1] &= 0x00FF;
} else { video->palette[video->bcpIndex >> 1] |= value << 8;
video->palette[video->bcpIndex >> 1] &= 0xFF00; } else {
video->palette[video->bcpIndex >> 1] |= value; video->palette[video->bcpIndex >> 1] &= 0xFF00;
video->palette[video->bcpIndex >> 1] |= value;
}
video->renderer->writePalette(video->renderer, video->bcpIndex >> 1, video->palette[video->bcpIndex >> 1]);
} }
video->renderer->writePalette(video->renderer, video->bcpIndex >> 1, video->palette[video->bcpIndex >> 1]);
if (video->bcpIncrement) { if (video->bcpIncrement) {
++video->bcpIndex; ++video->bcpIndex;
video->bcpIndex &= 0x3F; video->bcpIndex &= 0x3F;
@ -522,14 +524,16 @@ void GBVideoWritePalette(struct GBVideo* video, uint16_t address, uint8_t value)
video->p->memory.io[REG_BCPD] = video->palette[video->bcpIndex >> 1] >> (8 * (video->bcpIndex & 1)); video->p->memory.io[REG_BCPD] = video->palette[video->bcpIndex >> 1] >> (8 * (video->bcpIndex & 1));
break; break;
case REG_OCPD: case REG_OCPD:
if (video->ocpIndex & 1) { if (video->mode != 3) {
video->palette[8 * 4 + (video->ocpIndex >> 1)] &= 0x00FF; if (video->ocpIndex & 1) {
video->palette[8 * 4 + (video->ocpIndex >> 1)] |= value << 8; video->palette[8 * 4 + (video->ocpIndex >> 1)] &= 0x00FF;
} else { video->palette[8 * 4 + (video->ocpIndex >> 1)] |= value << 8;
video->palette[8 * 4 + (video->ocpIndex >> 1)] &= 0xFF00; } else {
video->palette[8 * 4 + (video->ocpIndex >> 1)] |= value; video->palette[8 * 4 + (video->ocpIndex >> 1)] &= 0xFF00;
video->palette[8 * 4 + (video->ocpIndex >> 1)] |= value;
}
video->renderer->writePalette(video->renderer, 8 * 4 + (video->ocpIndex >> 1), video->palette[8 * 4 + (video->ocpIndex >> 1)]);
} }
video->renderer->writePalette(video->renderer, 8 * 4 + (video->ocpIndex >> 1), video->palette[8 * 4 + (video->ocpIndex >> 1)]);
if (video->ocpIncrement) { if (video->ocpIncrement) {
++video->ocpIndex; ++video->ocpIndex;
video->ocpIndex &= 0x3F; video->ocpIndex &= 0x3F;