all repos — mgba @ 620459958c60833f24c4f9b02ffcc42bf919211a

mGBA Game Boy Advance Emulator

GBA Video: Fix OBJ blending regression (fix #1037)
Vicki Pfau vi@endrift.com
Sat, 14 Apr 2018 11:43:31 -0700
commit

620459958c60833f24c4f9b02ffcc42bf919211a

parent

a6c0ac994160d57ba8962963be0c9b5fc33c6ed3

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

jump to
M src/gba/renderers/video-software.c → src/gba/renderers/video-software.c 
@@ -569,7 +569,7 @@ }
 	}
 	if (softwareRenderer->target1Obj && (softwareRenderer->blendEffect == BLEND_DARKEN || softwareRenderer->blendEffect == BLEND_BRIGHTEN)) {
 		x = 0;
-		uint32_t mask = 0xFF000000 & ~FLAG_OBJWIN;
+		uint32_t mask = FLAG_REBLEND | FLAG_TARGET_1 | FLAG_IS_BACKGROUND;
 		uint32_t match = FLAG_REBLEND;
 		if (GBARegisterDISPCNTIsObjwinEnable(softwareRenderer->dispcnt)) {
 			mask |= FLAG_OBJWIN;