GBA Video: Fix blend issues with obscured middle layers

Conflicts:
	CHANGES
This commit is contained in:
Jeffrey Pfau 2014-12-23 00:10:08 -08:00
parent cd6a7c559e
commit 7e2e4be2e3
2 changed files with 3 additions and 2 deletions

View File

@ -12,6 +12,7 @@ Bugfixes:
- GBA Memory: Properly initialize 1 Mb flash, and add debug logging
- Qt: Properly set default video recording settings
- GBA Audio: Make larger buffer sizes than 2048 actually work properly
- GBA Video: Fix blend issues with obscured middle layers
Misc:
- Qt: Disable sync to video by default
- GBA: Exit cleanly on FATAL if the port supports it

View File

@ -1303,7 +1303,7 @@ static void _drawBackgroundMode0(struct GBAVideoSoftwareRenderer* renderer, stru
uint16_t* vram = renderer->d.vram;
if (!objwinSlowPath) {
if (!(flags & FLAG_TARGET_2)) {
if (!(flags & FLAG_TARGET_2) && renderer->blendEffect != BLEND_ALPHA) {
if (!background->multipalette) {
DRAW_BACKGROUND_MODE_0(16, NoBlend, NO_OBJWIN);
} else {
@ -1317,7 +1317,7 @@ static void _drawBackgroundMode0(struct GBAVideoSoftwareRenderer* renderer, stru
}
}
} else {
if (!(flags & FLAG_TARGET_2)) {
if (!(flags & FLAG_TARGET_2) && renderer->blendEffect != BLEND_ALPHA) {
if (!background->multipalette) {
DRAW_BACKGROUND_MODE_0(16, NoBlend, OBJWIN);
} else {