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

fix missing bg in love plus, broken since regression way back in r1764 due to my erroneous refactor of gpu code!!

This commit is contained in:
zeromus 2010-10-03 03:42:42 +00:00
parent 5ac1ce70b5
commit c1ad2cc5a4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
desmume/src/GPU.cpp
View File

@ -2162,15 +2162,15 @@ static void GPU_RenderLine_layer(NDS_Screen * screen, u16 l)
template<bool SKIP> static void GPU_RenderLine_DispCapture(u16 l) template<bool SKIP> static void GPU_RenderLine_DispCapture(u16 l)
{ {
//this macro takes advantage of the fact that there are only two possible values for capx //this macro takes advantage of the fact that there are only two possible values for capx
#define CAPCOPY(SRC,DST) \ #define CAPCOPY(SRC,DST,SETALPHABIT) \
switch(gpu->dispCapCnt.capx) { \ switch(gpu->dispCapCnt.capx) { \
case DISPCAPCNT::_128: \ case DISPCAPCNT::_128: \
for (int i = 0; i < 128; i++) \ for (int i = 0; i < 128; i++) \
HostWriteWord(DST, i << 1, HostReadWord(SRC, i << 1) | (1<<15)); \ HostWriteWord(DST, i << 1, HostReadWord(SRC, i << 1) | (SETALPHABIT?(1<<15):0)); \
break; \ break; \
case DISPCAPCNT::_256: \ case DISPCAPCNT::_256: \
for (int i = 0; i < 256; i++) \ for (int i = 0; i < 256; i++) \
HostWriteWord(DST, i << 1, HostReadWord(SRC, i << 1) | (1<<15)); \ HostWriteWord(DST, i << 1, HostReadWord(SRC, i << 1) | (SETALPHABIT?(1<<15):0)); \
break; \ break; \
default: assert(false); \ default: assert(false); \
} }
@ -2231,7 +2231,7 @@ template<bool SKIP> static void GPU_RenderLine_DispCapture(u16 l)
u8 *src; u8 *src;
src = (u8*)(gpu->tempScanline); src = (u8*)(gpu->tempScanline);
CAPCOPY(src,cap_dst); CAPCOPY(src,cap_dst,true);
} }
break; break;
case 1: // Capture 3D case 1: // Capture 3D
@ -2239,7 +2239,7 @@ template<bool SKIP> static void GPU_RenderLine_DispCapture(u16 l)
//INFO("Capture 3D\n"); //INFO("Capture 3D\n");
u16* colorLine; u16* colorLine;
gfx3d_GetLineData15bpp(l, &colorLine); gfx3d_GetLineData15bpp(l, &colorLine);
CAPCOPY(((u8*)colorLine),cap_dst); CAPCOPY(((u8*)colorLine),cap_dst,false);
} }
break; break;
} }
@ -2252,7 +2252,7 @@ template<bool SKIP> static void GPU_RenderLine_DispCapture(u16 l)
{ {
case 0: case 0:
//Capture VRAM //Capture VRAM
CAPCOPY(cap_src,cap_dst); CAPCOPY(cap_src,cap_dst,true);
break; break;
case 1: case 1:
//capture dispfifo //capture dispfifo