mirror of https://github.com/mgba-emu/mgba.git
GBA Video: Fix merge
This commit is contained in:
parent
fb94f99cd8
commit
60fb32b71f
|
@ -513,10 +513,6 @@ static void GBAVideoSoftwareRendererDrawScanline(struct GBAVideoRenderer* render
|
|||
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;
|
||||
|
@ -750,6 +746,11 @@ void GBAVideoSoftwareRendererPreprocessBuffer(struct GBAVideoSoftwareRenderer* s
|
|||
softwareRenderer->row[x] = backdrop;
|
||||
}
|
||||
}
|
||||
|
||||
if (softwareRenderer->blendDirty) {
|
||||
_updatePalettes(softwareRenderer);
|
||||
softwareRenderer->blendDirty = false;
|
||||
}
|
||||
}
|
||||
|
||||
void GBAVideoSoftwareRendererPostprocessBuffer(struct GBAVideoSoftwareRenderer* softwareRenderer) {
|
||||
|
|
Loading…
Reference in New Issue