[Desmume-cvs] SF.net SVN: desmume:[3798] trunk/desmume/src/GPU.cpp

[<ze...@us...>]

Revision: 3798
          http://desmume.svn.sourceforge.net/desmume/?rev=3798&view=rev
Author:   zeromus
Date:     2010-10-03 03:42:42 +0000 (Sun, 03 Oct 2010)

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

Modified Paths:
--------------
    trunk/desmume/src/GPU.cpp

Modified: trunk/desmume/src/GPU.cpp
===================================================================
--- trunk/desmume/src/GPU.cpp	2010-10-02 02:04:54 UTC (rev 3797)
+++ trunk/desmume/src/GPU.cpp	2010-10-03 03:42:42 UTC (rev 3798)
@@ -2162,15 +2162,15 @@
 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
-	#define CAPCOPY(SRC,DST) \
+	#define CAPCOPY(SRC,DST,SETALPHABIT) \
 	switch(gpu->dispCapCnt.capx) { \
 		case DISPCAPCNT::_128: \
 			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; \
 		case DISPCAPCNT::_256: \
 			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; \
 			default: assert(false); \
 		}
@@ -2231,7 +2231,7 @@
 
 									u8 *src;
 									src = (u8*)(gpu->tempScanline);
-									CAPCOPY(src,cap_dst);
+									CAPCOPY(src,cap_dst,true);
 								}
 							break;
 							case 1:			// Capture 3D
@@ -2239,7 +2239,7 @@
 									//INFO("Capture 3D\n");
 									u16* colorLine;
 									gfx3d_GetLineData15bpp(l, &colorLine);
-									CAPCOPY(((u8*)colorLine),cap_dst);
+									CAPCOPY(((u8*)colorLine),cap_dst,false);
 								}
 							break;
 						}
@@ -2252,7 +2252,7 @@
 						{
 							case 0:	
 								//Capture VRAM
-								CAPCOPY(cap_src,cap_dst);
+								CAPCOPY(cap_src,cap_dst,true);
 								break;
 							case 1:
 								//capture dispfifo


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.