GBA Video: Fix merge
Vicki Pfau vi@endrift.com
Mon, 06 Mar 2017 01:06:47 -0800
1 files changed,
5 insertions(+),
4 deletions(-)
M
src/gba/renderers/video-software.c
→
src/gba/renderers/video-software.c
@@ -513,10 +513,6 @@
GBAVideoSoftwareRendererPreprocessBuffer(softwareRenderer, y); int spriteLayers = GBAVideoSoftwareRendererPreprocessSpriteLayer(softwareRenderer, y); softwareRenderer->d.vramOBJ[0] = objVramBase; - if (softwareRenderer->blendDirty) { - _updatePalettes(softwareRenderer); - softwareRenderer->blendDirty = false; - } int w; unsigned priority;@@ -749,6 +745,11 @@ }
for (; x < end; ++x) { softwareRenderer->row[x] = backdrop; } + } + + if (softwareRenderer->blendDirty) { + _updatePalettes(softwareRenderer); + softwareRenderer->blendDirty = false; } }