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

GBA Video: Fix caching with background toggling (fixes #1118)

This commit is contained in:
Vicki Pfau 2018-09-28 11:38:33 -07:00
parent 5fa1638b1d
commit a3a9fb467c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -106,6 +106,7 @@ Bugfixes:
- PSP2: Fix audio crackling after fast forward - PSP2: Fix audio crackling after fast forward
- PSP2: Fix audio crackling when buffer is full - PSP2: Fix audio crackling when buffer is full
- 3DS: Fix unused screens not clearing (fixes mgba.io/i/1184) - 3DS: Fix unused screens not clearing (fixes mgba.io/i/1184)
- GBA Video: Fix caching with background toggling (fixes mgba.io/i/1118)
Misc: Misc:
- mGUI: Add SGB border configuration option - mGUI: Add SGB border configuration option

10
src/gba/renderers/video-software.c
View File

@ -554,6 +554,8 @@ static void GBAVideoSoftwareRendererDrawScanline(struct GBAVideoRenderer* render
return; return;
} }
CLEAN_SCANLINE(softwareRenderer, y);
color_t* row = &softwareRenderer->outputBuffer[softwareRenderer->outputBufferStride * y]; color_t* row = &softwareRenderer->outputBuffer[softwareRenderer->outputBufferStride * y];
if (GBARegisterDISPCNTIsForcedBlank(softwareRenderer->dispcnt)) { if (GBARegisterDISPCNTIsForcedBlank(softwareRenderer->dispcnt)) {
int x; int x;
@ -675,7 +677,6 @@ static void GBAVideoSoftwareRendererDrawScanline(struct GBAVideoRenderer* render
#else #else
memcpy(row, softwareRenderer->row, VIDEO_HORIZONTAL_PIXELS * sizeof(*row)); memcpy(row, softwareRenderer->row, VIDEO_HORIZONTAL_PIXELS * sizeof(*row));
#endif #endif
CLEAN_SCANLINE(softwareRenderer, y);
} }
static void GBAVideoSoftwareRendererFinishFrame(struct GBAVideoRenderer* renderer) { static void GBAVideoSoftwareRendererFinishFrame(struct GBAVideoRenderer* renderer) {
@ -722,9 +723,10 @@ static void GBAVideoSoftwareRendererPutPixels(struct GBAVideoRenderer* renderer,
} }
static void _enableBg(struct GBAVideoSoftwareRenderer* renderer, int bg, bool active) { static void _enableBg(struct GBAVideoSoftwareRenderer* renderer, int bg, bool active) {
int wasActive = renderer->bg[bg].enabled;
if (!active) { if (!active) {
renderer->bg[bg].enabled = 0; renderer->bg[bg].enabled = 0;
} else if (!renderer->bg[bg].enabled && active) { } else if (!wasActive && active) {
if (renderer->nextY == 0) { if (renderer->nextY == 0) {
renderer->bg[bg].enabled = 4; renderer->bg[bg].enabled = 4;
} else { } else {
@ -901,15 +903,19 @@ static void _drawScanline(struct GBAVideoSoftwareRenderer* renderer, int y) {
if (renderer->bg[0].enabled > 0 && renderer->bg[0].enabled < 4) { if (renderer->bg[0].enabled > 0 && renderer->bg[0].enabled < 4) {
++renderer->bg[0].enabled; ++renderer->bg[0].enabled;
DIRTY_SCANLINE(renderer, y);
} }
if (renderer->bg[1].enabled > 0 && renderer->bg[1].enabled < 4) { if (renderer->bg[1].enabled > 0 && renderer->bg[1].enabled < 4) {
++renderer->bg[1].enabled; ++renderer->bg[1].enabled;
DIRTY_SCANLINE(renderer, y);
} }
if (renderer->bg[2].enabled > 0 && renderer->bg[2].enabled < 4) { if (renderer->bg[2].enabled > 0 && renderer->bg[2].enabled < 4) {
++renderer->bg[2].enabled; ++renderer->bg[2].enabled;
DIRTY_SCANLINE(renderer, y);
} }
if (renderer->bg[3].enabled > 0 && renderer->bg[3].enabled < 4) { if (renderer->bg[3].enabled > 0 && renderer->bg[3].enabled < 4) {
++renderer->bg[3].enabled; ++renderer->bg[3].enabled;
DIRTY_SCANLINE(renderer, y);
} }
} }