all repos — mgba @ 4bd35550455e74a870a52c611d8e39d4dde20015

mGBA Game Boy Advance Emulator

GBA Video: Fix windows not affecting sprites
Jeffrey Pfau jeffrey@endrift.com
Tue, 16 Jun 2015 22:02:19 -0700
commit

4bd35550455e74a870a52c611d8e39d4dde20015

parent

3cddb332880dff06bc9259965acbad589c5d7fef

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

jump to
M CHANGESCHANGES

@@ -44,6 +44,7 @@ - GBA Audio: Fix audio pitch changing when adjusting buffer size

- SDL: Fix SDL build when OpenGL is missing - ARM7: Fix timing of multiplies to use N cycles - GBA: Fix calls to endian-independent loadstores + - GBA Video: Fix windows not affecting sprites Misc: - Qt: Handle saving input settings better - Debugger: Free watchpoints in addition to breakpoints
M src/gba/renderers/video-software.csrc/gba/renderers/video-software.c

@@ -736,7 +736,7 @@ for (w = 0; w < renderer->nWindows; ++w) {

renderer->start = renderer->end; renderer->end = renderer->windows[w].endX; renderer->currentWindow = renderer->windows[w].control; - if (spriteLayers & (1 << priority)) { + if (GBAWindowControlIsObjEnable(renderer->currentWindow.packed) && spriteLayers & (1 << priority)) { _postprocessSprite(renderer, priority); } if (TEST_LAYER_ENABLED(0) && GBARegisterDISPCNTGetMode(renderer->dispcnt) < 2) {