GBA Video: Remove broken sprite blending hack (fixes #532)

mgba-emu · Sep 20, 2017 · f1d6470fdbdf9ee90d99a319e2193ed048789ccc · f1d6470
1 parent 1bc6c13
commit f1d6470fdbdf9ee90d99a319e2193ed048789ccc
diff --git a/CHANGES b/CHANGES
@@ -40,6 +40,7 @@ Bugfixes:
  - GBA Savedata: Fix 512 byte EEPROM saving as 8kB (fixes mgba.io/i/877)
  - SDL: Fix potential race condition when pressing keys (fixes mgba.io/i/872)
  - GBA: Fix keypad IRQs not firing when extra buttons are pressed
+ - GBA Video: Remove broken sprite blending hack (fixes mgba.io/i/532)
 Misc:
  - GBA Timer: Use global cycles for timers
  - GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722)
diff --git a/src/gba/renderers/software-obj.c b/src/gba/renderers/software-obj.c
@@ -167,8 +167,11 @@ int GBAVideoSoftwareRendererPreprocessSprite(struct GBAVideoSoftwareRenderer* re
 		target2 |= renderer->bg[3].target2 << (renderer->bg[3].priority);
 		if ((1 << GBAObjAttributesCGetPriority(sprite->c)) <= target2) {
 			variant = 0;
+		} else {
+			flags &= ~FLAG_TARGET_1;
 		}
 	}
+
 	color_t* palette = &renderer->normalPalette[0x100];
 	color_t* objwinPalette = palette;
 	int objwinSlowPath = GBARegisterDISPCNTIsObjwinEnable(renderer->dispcnt) && GBAWindowControlGetBlendEnable(renderer->objwin.packed) != GBAWindowControlIsBlendEnable(renderer->currentWindow.packed);
diff --git a/src/platform/python/tests/cinema/.gitignore b/src/platform/python/tests/cinema/.gitignore
@@ -0,0 +1 @@
+*.sav
diff --git a/src/platform/python/tests/cinema/gba/blend/gs-obj-modes/baseline_0000.png b/src/platform/python/tests/cinema/gba/blend/gs-obj-modes/baseline_0000.png
diff --git a/src/platform/python/tests/cinema/gba/blend/gs-obj-modes/baseline_0001.png b/src/platform/python/tests/cinema/gba/blend/gs-obj-modes/baseline_0001.png
diff --git a/src/platform/python/tests/cinema/gba/blend/gs-obj-modes/baseline_0002.png b/src/platform/python/tests/cinema/gba/blend/gs-obj-modes/baseline_0002.png
diff --git a/src/platform/python/tests/cinema/gba/blend/gs-obj-modes/baseline_0003.png b/src/platform/python/tests/cinema/gba/blend/gs-obj-modes/baseline_0003.png
diff --git a/src/platform/python/tests/cinema/gba/blend/gs-obj-modes/baseline_0004.png b/src/platform/python/tests/cinema/gba/blend/gs-obj-modes/baseline_0004.png
diff --git a/src/platform/python/tests/cinema/gba/blend/gs-obj-modes/baseline_0005.png b/src/platform/python/tests/cinema/gba/blend/gs-obj-modes/baseline_0005.png
diff --git a/src/platform/python/tests/cinema/gba/blend/gs-obj-modes/test.mvl b/src/platform/python/tests/cinema/gba/blend/gs-obj-modes/test.mvl
diff --git a/src/platform/python/tests/cinema/gba/blend/kam-knockout/baseline_0000.png b/src/platform/python/tests/cinema/gba/blend/kam-knockout/baseline_0000.png
diff --git a/src/platform/python/tests/cinema/gba/blend/kam-knockout/baseline_0001.png b/src/platform/python/tests/cinema/gba/blend/kam-knockout/baseline_0001.png
diff --git a/src/platform/python/tests/cinema/gba/blend/kam-knockout/baseline_0002.png b/src/platform/python/tests/cinema/gba/blend/kam-knockout/baseline_0002.png
diff --git a/src/platform/python/tests/cinema/gba/blend/kam-knockout/baseline_0003.png b/src/platform/python/tests/cinema/gba/blend/kam-knockout/baseline_0003.png
diff --git a/src/platform/python/tests/cinema/gba/blend/kam-knockout/test.mvl b/src/platform/python/tests/cinema/gba/blend/kam-knockout/test.mvl