Max/mgba-ps3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GBA Video: Fix sprite priority regression (fixes #1419)

Browse Source
This commit is contained in:
Vicki Pfau 2019-05-24 20:48:36 -07:00
parent d1d33393cd
commit a33e9d375c
9 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
cinema/gba/obj/fzc-obj-priority/baseline_0000.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
cinema/gba/obj/fzc-obj-priority/baseline_0001.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
cinema/gba/obj/fzc-obj-priority/baseline_0002.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
cinema/gba/obj/fzc-obj-priority/baseline_0003.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
cinema/gba/obj/fzc-obj-priority/baseline_0004.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
cinema/gba/obj/fzc-obj-priority/baseline_0005.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
cinema/gba/obj/fzc-obj-priority/baseline_0006.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
cinema/gba/obj/fzc-obj-priority/test.mvl Normal file
View File

Binary file not shown.

8
src/gba/renderers/software-obj.c
View File

@ -80,7 +80,7 @@
LOAD_16(tileData, ((yBase + charBase + xBase) & 0x7FFE), vramBase); \ LOAD_16(tileData, ((yBase + charBase + xBase) & 0x7FFE), vramBase); \
tileData = (tileData >> ((localX & 3) << 2)) & 0xF; \ tileData = (tileData >> ((localX & 3) << 2)) & 0xF; \
current = renderer->spriteLayer[outX]; \ current = renderer->spriteLayer[outX]; \
if ((current & FLAG_UNWRITTEN) == FLAG_UNWRITTEN && tileData) { \ if ((current & FLAG_ORDER_MASK) > flags && tileData) { \
renderer->spriteLayer[outX] = palette[tileData] | flags; \ renderer->spriteLayer[outX] = palette[tileData] | flags; \
} }
@ -88,7 +88,7 @@
LOAD_16(tileData, ((yBase + charBase + xBase) & 0x7FFE), vramBase); \ LOAD_16(tileData, ((yBase + charBase + xBase) & 0x7FFE), vramBase); \
tileData = (tileData >> ((localX & 3) << 2)) & 0xF; \ tileData = (tileData >> ((localX & 3) << 2)) & 0xF; \
current = renderer->spriteLayer[outX]; \ current = renderer->spriteLayer[outX]; \
if ((current & FLAG_UNWRITTEN) == FLAG_UNWRITTEN && tileData) { \ if ((current & FLAG_ORDER_MASK) > flags && tileData) { \
unsigned color = (renderer->row[outX] & FLAG_OBJWIN) ? objwinPalette[tileData] : palette[tileData]; \ unsigned color = (renderer->row[outX] & FLAG_OBJWIN) ? objwinPalette[tileData] : palette[tileData]; \
renderer->spriteLayer[outX] = color | flags; \ renderer->spriteLayer[outX] = color | flags; \
} }
@ -107,7 +107,7 @@
LOAD_16(tileData, ((yBase + charBase + xBase) & 0x7FFE), vramBase); \ LOAD_16(tileData, ((yBase + charBase + xBase) & 0x7FFE), vramBase); \
tileData = (tileData >> ((localX & 1) << 3)) & 0xFF; \ tileData = (tileData >> ((localX & 1) << 3)) & 0xFF; \
current = renderer->spriteLayer[outX]; \ current = renderer->spriteLayer[outX]; \
if ((current & FLAG_UNWRITTEN) == FLAG_UNWRITTEN && tileData) { \ if ((current & FLAG_ORDER_MASK) > flags && tileData) { \
renderer->spriteLayer[outX] = palette[tileData] | flags; \ renderer->spriteLayer[outX] = palette[tileData] | flags; \
} }
@ -115,7 +115,7 @@
LOAD_16(tileData, ((yBase + charBase + xBase) & 0x7FFE), vramBase); \ LOAD_16(tileData, ((yBase + charBase + xBase) & 0x7FFE), vramBase); \
tileData = (tileData >> ((localX & 1) << 3)) & 0xFF; \ tileData = (tileData >> ((localX & 1) << 3)) & 0xFF; \
current = renderer->spriteLayer[outX]; \ current = renderer->spriteLayer[outX]; \
if ((current & FLAG_UNWRITTEN) == FLAG_UNWRITTEN && tileData) { \ if ((current & FLAG_ORDER_MASK) > flags && tileData) { \
unsigned color = (renderer->row[outX] & FLAG_OBJWIN) ? objwinPalette[tileData] : palette[tileData]; \ unsigned color = (renderer->row[outX] & FLAG_OBJWIN) ? objwinPalette[tileData] : palette[tileData]; \
renderer->spriteLayer[outX] = color | flags; \ renderer->spriteLayer[outX] = color | flags; \
} }