zzogl-pg: Committing a start of a GifTransfer rewrite so I can go back to it easily. (Unless you like seeing what games look like with missing graphics, I'd leave the define for it disabled for the moment.)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2808 96395faa-99c1-11dd-bbfe-3dabce05a288

plugins/zzogl-pg/opengl/GifTransfer.cpp

@@ -85,6 +85,206 @@ __forceinline void gifTransferLog(int index, u32 *pMem, u32 size)
 #endif
 }
 
+#ifdef NEW_GIF_TRANSFER
+
+extern int g_GSMultiThreaded;
+
+template<int index> void _GSgifTransfer(u32 *pMem, u32 size)
+{
+	FUNCLOG
+
+	pathInfo *path = &gs.path[index];
+	
+#ifdef _WIN32
+	assert( g_hCurrentThread == GetCurrentThread() );
+#endif
+
+#ifdef _DEBUG
+	gifTransferLog(index, pMem, size);
+#endif
+
+	while(size > 0)
+	{
+		//LOG(_T("Transfer(%08x, %d) START\n"), pMem, size);
+		if (path->nloop == 0) 
+		{
+			path->setTag(pMem);
+			pMem += 4;
+			size--;
+
+			if ((g_GameSettings & GAME_PATH3HACK) && (index == 2) && path->eop) nPath3Hack = 1;
+				
+			// eeuser 7.2.2. GIFtag: "... when NLOOP is 0, the GIF does not output anything, and 
+			// values other than the EOP field are disregarded."
+			if (path->nloop > 0) 
+			{
+				gs.q = 1.0f;
+
+				// ASSERT(!(path.tag.PRE && path.tag.FLG == GIF_FLG_REGLIST)); // kingdom hearts
+
+				if(path->tag.PRE && (path->tag.FLG == GIF_FLG_PACKED))
+				{
+					u32 tagprim = path->tag.PRIM;
+					GIFRegHandlerPRIM((u32*)&tagprim);
+				}
+			}
+		}
+		else
+		{
+			switch(path->tag.FLG)
+			{
+				case GIF_FLG_PACKED:
+				{
+					do
+					{
+						u32 reg = path->GetReg();
+							
+						g_GIFPackedRegHandlers[reg](pMem);
+						
+						pMem += 4;
+						size--;
+					}
+					while(path->StepReg() && size > 0);
+					break;
+				}
+				case GIF_FLG_REGLIST:
+				{
+					size *= 2;
+
+					do
+					{
+						int reg = path->GetReg();
+						g_GIFRegHandlers[reg](pMem);
+						
+						pMem += 2;
+						size--;
+					}
+					while(path->StepReg() && size > 0);
+					
+					if (size & 1) pMem += 2;
+
+					size /= 2;
+					break;
+				}
+				case GIF_FLG_IMAGE2: // hmmm
+				{
+					assert(0);
+					path->nloop = 0;
+					break;
+				}
+						
+				case GIF_FLG_IMAGE: // FROM_VFRAM
+				{
+					int len = (int)min(size, path->nloop);
+
+					switch(gs.imageTransfer)
+					{
+						case 0:
+							ZeroGS::TransferHostLocal(pMem, len * 4);
+							break;
+						case 1: 
+							ZeroGS::TransferLocalHost(pMem, len);
+							break;
+						case 2: 
+							//Move();
+							break;
+						case 3: 
+							assert(0);
+							break;
+						default: 
+							assert(0);
+							break;
+					}
+					
+					pMem += len * 16;
+					path->nloop -= len;
+					size -= len;
+						
+					break;
+				}
+				default: // GIF_IMAGE
+					GS_LOG("*** WARNING **** Unexpected GIFTag flag\n");
+					assert(0);
+					break;
+				}
+		}
+		
+		
+		if (index == 0)
+		{
+			if(path->tag.EOP && path->nloop == 0)
+			{
+				break;
+			}
+		}
+	}
+	
+	if(index == 0)
+	{
+		if(size == 0 && path->nloop > 0)
+		{
+			if (g_GSMultiThreaded)
+			{
+				// TODO
+
+				path->nloop = 0;
+			}
+			else
+			{
+				_GSgifTransfer<0>(pMem - 0x4000, 0x4000 / 16);
+			}
+		}
+	}
+}
+
+void CALLBACK GSgifTransfer1(u32 *pMem, u32 addr)
+{
+	FUNCLOG
+
+	pathInfo *path = &gs.path[0];
+	
+	//GS_LOG("GSgifTransfer1 0x%x (mode %d)\n", addr, path->mode);
+	
+//	addr &= 0x3fff;
+
+#ifdef _DEBUG
+	PRIM_LOG("count: %d\n", count);
+	count++;
+#endif
+
+	path->nloop = 0;
+	path->eop = 0;
+	_GSgifTransfer<0>((u32*)((u8*)pMem + addr), (0x4000 - addr)/16);
+
+	if (!path->eop && (path->nloop > 0)) 
+	{
+		assert( (addr&0xf) == 0 ); //BUG
+		path->nloop = 0;
+		ERROR_LOG("Transfer1 - 2\n");
+		return;
+	}
+}
+
+void CALLBACK GSgifTransfer2(u32 *pMem, u32 size)
+{
+	FUNCLOG
+
+	//GS_LOG("GSgifTransfer2 size = %lx (mode %d, gs.path2.tag.nloop = %d)\n", size, gs.path[1].mode, gs.path[1].tag.nloop);
+	
+	_GSgifTransfer<1>(pMem, size);
+}
+
+void CALLBACK GSgifTransfer3(u32 *pMem, u32 size)
+{
+	FUNCLOG
+
+	//GS_LOG("GSgifTransfer3 size = %lx (mode %d, gs.path3.tag.nloop = %d)\n", size, gs.path[2].mode, gs.path[2].tag.nloop);
+
+	nPath3Hack = 0;
+	_GSgifTransfer<2>(pMem, size);
+}
+#else
+
 template<int index> void _GSgifTransfer(u32 *pMem, u32 size)
 {
         FUNCLOG
@@ -305,7 +505,7 @@ void CALLBACK GSgifTransfer3(u32 *pMem, u32 size)
 	nPath3Hack = 0;
 	_GSgifTransfer<2>(pMem, size);
 }
-
+#endif
 #ifdef _DEBUG
 static int count = 0;
 #endif

plugins/zzogl-pg/opengl/GifTransfer.h

@@ -22,6 +22,8 @@
 #include "Regs.h"
 #include "Util.h"
 
+// This is fairly broken right now, and shouldn't be enabled unless you feel like fixing it.
+//#define NEW_GIF_TRANSFER
 enum GIF_FLG
 {
 	GIF_FLG_PACKED	= 0,
@@ -53,7 +55,6 @@ union GIFTag
 		for(int i = 0; i <= 3; i++)
 		{
 			ai32[i] = data[i];
-			ERROR_LOG("Set tag %i\n", i);
 		}
 	}
 	GIFTag(u32 *data)
@@ -73,8 +74,64 @@ typedef struct
 	int nloop;
 	int eop;
 	int nreg;
+	u32 adonly;
 	GIFTag tag;
 
+#ifdef NEW_GIF_TRANSFER	
+	void setTag(u32 *data) 
+	{
+		tag.set(data);
+
+		nloop	= tag.NLOOP;
+		eop		= tag.EOP;
+		mode	= tag.FLG;
+		nreg	= tag.NREG;
+		//regs = tag.REGS;
+		//regn = 0;
+		
+		ERROR_LOG("GIFtag: %8.8lx_%8.8lx_%8.8lx_%8.8lx: EOP=%d, NLOOP=%x, FLG=%x, NREG=%d, PRE=%d\n",
+				data[3], data[2], data[1], data[0],
+				eop, nloop, mode, nreg, tag.PRE);
+		
+
+		switch (mode) 
+		{
+			case GIF_FLG_PACKED:
+				regs = *(u64 *)(data+2);
+				regn = 0;
+				break;
+
+			case GIF_FLG_REGLIST:
+				regs = *(u64 *)(data+2);
+				regn = 0;
+				break;
+		}
+
+		adonly = (nreg == 1) && ((u8)regs == 0xe);
+	}
+	
+	u32 GetReg() 
+	{
+		return (regs >> regn) & 0xf;
+	}
+
+	bool StepReg()
+	{
+		regn += 1;
+							
+		if ((regn & 0xf) == nreg) 
+		{
+			regn = 0;
+								
+			if (--nloop <= 0) 
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+#else
+       
         void setTag(u32 *data) 
         {
                 tag.set(data);
@@ -110,6 +167,7 @@ typedef struct
 						break;
                 }
         }
+#endif
 } pathInfo;
 
 void _GSgifPacket(pathInfo *path, u32 *pMem);