ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GBA Video: Fix mode 4 transparency in OpenGL (fixes #1907)

This commit is contained in:
Vicki Pfau 2020-10-11 16:37:49 -07:00
parent 7b3900ff93
commit 8b8ff65821
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -49,6 +49,7 @@ Emulation fixes:
- GBA Video: Emulate sprite cycle limits in OpenGL renderer (fixes mgba.io/i/1635) - GBA Video: Emulate sprite cycle limits in OpenGL renderer (fixes mgba.io/i/1635)
- GBA Video: Do not affect OBJ pixel priority when writing OBJWIN (fixes mgba.io/i/1890) - GBA Video: Do not affect OBJ pixel priority when writing OBJWIN (fixes mgba.io/i/1890)
- GBA Video: Fix deferred blending when OBJWIN matches window (fixes mgba.io/i/1905) - GBA Video: Fix deferred blending when OBJWIN matches window (fixes mgba.io/i/1905)
- GBA Video: Fix mode 4 transparency in OpenGL (fixes mgba.io/i/1907)
- SM83: Emulate HALT bug - SM83: Emulate HALT bug
Other fixes: Other fixes:
- 3DS: Redo video sync to be more precise - 3DS: Redo video sync to be more precise

6
src/gba/renderers/gl.c
View File

@ -391,7 +391,11 @@ static const char* const _renderMode4 =
" }\n" " }\n"
" int address = charBase + (coord.x >> 8) + (coord.y >> 8) * size.x;\n" " int address = charBase + (coord.x >> 8) + (coord.y >> 8) * size.x;\n"
" int twoEntries = texelFetch(vram, ivec2((address >> 1) & 255, address >> 9), 0).r;\n" " int twoEntries = texelFetch(vram, ivec2((address >> 1) & 255, address >> 9), 0).r;\n"
" int paletteEntry = palette[(twoEntries >> (8 * (address & 1)) & 255)];\n" " int entry = (twoEntries >> (8 * (address & 1))) & 255;\n"
" if (entry == 0) {\n"
" discard;\n"
" }\n"
" int paletteEntry = palette[entry];\n"
" color = vec4(PALETTE_ENTRY(paletteEntry), 1.);\n" " color = vec4(PALETTE_ENTRY(paletteEntry), 1.);\n"
"}"; "}";