all repos — mgba @ e5161b766d6b8bdd21a174724b435c68185462e0

mGBA Game Boy Advance Emulator

GBA Video: Fix enabling layers in non-tile modes (fixes #1317)
Vicki Pfau vi@endrift.com
Sat, 23 Feb 2019 00:13:22 -0800
commit

e5161b766d6b8bdd21a174724b435c68185462e0

parent

5effd9c1132216b683291baa850965747663b7ff

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

jump to
M CHANGESCHANGES

@@ -23,6 +23,7 @@ - GBA DMA: Fix Display Start DMAs

- GBA DMA: Fix DMA start/end timing - Qt: Fix window icon on X11 - GB, GBA Serialize: Fix loading two states in a row + - GBA Video: Fix enabling layers in non-tile modes (fixes mgba.io/i/1317) Misc: - GBA Savedata: EEPROM performance fixes - GBA Savedata: Automatically map 1Mbit Flash files as 1Mbit Flash
M src/gba/renderers/video-software.csrc/gba/renderers/video-software.c

@@ -727,7 +727,8 @@ int wasActive = renderer->bg[bg].enabled;

if (!active) { renderer->bg[bg].enabled = 0; } else if (!wasActive && active) { - if (renderer->nextY == 0) { + if (renderer->nextY == 0 || GBARegisterDISPCNTGetMode(renderer->dispcnt) > 2) { + // TODO: Investigate in more depth how switching background works in different modes renderer->bg[bg].enabled = 4; } else { renderer->bg[bg].enabled = 1;