all repos — mgba @ bafcee7b1879b61e66302110aecf54f62b672325

mGBA Game Boy Advance Emulator

GBA Video: Fix regression when fixing sprite blending
Jeffrey Pfau jeffrey@endrift.com
Thu, 17 Sep 2015 19:42:09 -0700
commit

bafcee7b1879b61e66302110aecf54f62b672325

parent

f6e0239cd339da24e04b30e394f84cffd4197a79

3 files changed, 7 insertions(+), 6 deletions(-)

jump to
M src/gba/renderers/software-private.h → src/gba/renderers/software-private.h 
@@ -42,7 +42,7 @@ if (color >= current) {
 		if (current & FLAG_TARGET_1 && color & FLAG_TARGET_2) {
 			color = _mix(renderer->blda, current, renderer->bldb, color);
 		} else {
-			color = current & (0x00FFFFFF | FLAG_TARGET_1);
+			color = (current & 0x00FFFFFF) | ((current >> 1) & FLAG_REBLEND);
 		}
 	} else {
 		color = (color & ~FLAG_TARGET_2) | (current & FLAG_OBJWIN);

@@ -55,7 +55,7 @@ if (color >= current) {
 		if (current & FLAG_TARGET_1 && color & FLAG_TARGET_2) {
 			color = _mix(renderer->blda, current, renderer->bldb, color);
 		} else {
-			color = current & (0x00FFFFFF | FLAG_TARGET_1);
+			color = (current & 0x00FFFFFF) | ((current >> 1) & FLAG_REBLEND);
 		}
 	} else {
 		color = color & ~FLAG_TARGET_2;

@@ -69,7 +69,7 @@ UNUSED(renderer);
 	if (color < current) {
 		color |= (current & FLAG_OBJWIN);
 	} else {
-		color = current & (0x00FFFFFF | FLAG_TARGET_1);
+		color = (current & 0x00FFFFFF) | ((current >> 1) & FLAG_REBLEND);
 	}
 	*pixel = color;
 }

@@ -78,7 +78,7 @@ static inline void _compositeNoBlendNoObjwin(struct GBAVideoSoftwareRenderer* renderer, uint32_t* pixel, uint32_t color,
                                              uint32_t current) {
 	UNUSED(renderer);
 	if (color >= current) {
-		color = current & (0x00FFFFFF | FLAG_TARGET_1);
+		color = (current & 0x00FFFFFF) | ((current >> 1) & FLAG_REBLEND);
 	}
 	*pixel = color;
 }
M src/gba/renderers/video-software.c → src/gba/renderers/video-software.c 
@@ -548,14 +548,14 @@ int end = softwareRenderer->windows[w].endX;
 			if (softwareRenderer->blendEffect == BLEND_DARKEN) {
 				for (; x < end; ++x) {
 					uint32_t color = softwareRenderer->row[x];
-					if (color & FLAG_TARGET_1 && !(color & FLAG_UNWRITTEN)) {
+					if ((color & 0xFF000000) == FLAG_REBLEND) {
 						softwareRenderer->row[x] = _darken(color, softwareRenderer->bldy);
 					}
 				}
 			} else if (softwareRenderer->blendEffect == BLEND_BRIGHTEN) {
 				for (; x < end; ++x) {
 					uint32_t color = softwareRenderer->row[x];
-					if (color & FLAG_TARGET_1 && !(color & FLAG_UNWRITTEN)) {
+					if ((color & 0xFF000000) == FLAG_REBLEND) {
 						softwareRenderer->row[x] = _brighten(color, softwareRenderer->bldy);
 					}
 				}
M src/gba/renderers/video-software.h → src/gba/renderers/video-software.h 
@@ -74,6 +74,7 @@ #define FLAG_UNWRITTEN      0xFC000000
 #define FLAG_TARGET_1       0x02000000
 #define FLAG_TARGET_2       0x01000000
 #define FLAG_OBJWIN         0x01000000
+#define FLAG_REBLEND        0x01000000
 #define FLAG_ORDER_MASK     0xF8000000
 
 #define IS_WRITABLE(PIXEL) ((PIXEL) & 0xFE000000)