piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-23 14:19:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

OpenGL: fix cases of layers/sprites blending over the 3D layer

Browse Source
This commit is contained in:
Arisotura
2019-06-01 03:39:35 +02:00
parent 27d21e06df
commit 78208a9728
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/GPU2D.cpp
View File

@ -1443,7 +1443,8 @@ void GPU2D::DrawScanline_BGOBJ(u32 line)
eva = flag1 & 0x1F; eva = flag1 & 0x1F;
evb = 16 - eva; evb = 16 - eva;
} }
else if ((BlendCnt & target1) && (WindowMask[i] & 0x20)) else if (((BlendCnt & target1) && (WindowMask[i] & 0x20)) ||
((flag1 & 0xC0) == 0x80))
{ {
eva = EVA; eva = EVA;
evb = EVB; evb = EVB;
@ -1453,7 +1454,7 @@ void GPU2D::DrawScanline_BGOBJ(u32 line)
BGOBJLine[i] = val1; BGOBJLine[i] = val1;
BGOBJLine[256+i] = ColorComposite(i, val1, val3); BGOBJLine[256+i] = ColorComposite(i, val1, val3);
BGOBJLine[512+i] = (bldcnteffect << 24) | (EVB << 16) | (EVA << 8) | (val1 & 0xFF); BGOBJLine[512+i] = (bldcnteffect << 24) | (EVB << 16) | (EVA << 8) | (val2 & 0xFF);
} }
else else
{ {