GregMiscellaneous: zzogl-pg: Add a header for HostMemory.

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

plugins/zzogl-pg/opengl/CMakeLists.txt

@@ -82,6 +82,7 @@ set(zzoglHeaders
     GifTransfer.h
     # glprocs.h
     GS.h
+    HostMemory.h
     Mem.h
     Mem_Swizzle.h
     Mem_Transmit.h

plugins/zzogl-pg/opengl/GS.h

@@ -25,6 +25,7 @@
 
 #include "Util.h"
 #include "GifTransfer.h"
+#include "HostMemory.h"
 
 using namespace std;
 
@@ -33,31 +34,6 @@ extern float fFPS;
 #define MEMORY_END 0x00400000
 
 extern int g_LastCRC;
-extern u8* g_pBasePS2Mem;
-
-extern u8* g_pbyGSMemory;
-
-class GSMemory
-{
-	public:
-		void init();
-		void destroy();
-		u8* get();
-		u8* get(u32 addr);
-		u8* get_raw(u32 addr);
-};
-
-extern u8* g_pbyGSClut;		// the temporary clut buffer
-
-class GSClut
-{
-	public:
-		void init();
-		void destroy();
-		u8* get();
-		u8* get(u32 addr);
-		u8* get_raw(u32 addr);
-};
 
 struct Vector_16F
 {

plugins/zzogl-pg/opengl/HostMemory.h

@@ -0,0 +1,84 @@
+/*  ZZ Open GL graphics plugin
+ *  Copyright (c)2009-2010 zeydlitz@gmail.com, arcum42@gmail.com
+ *  Based on Zerofrog's ZeroGS KOSMOS (c)2005-2008
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+ 
+#ifndef HOSTMEMORY_H_INCLUDED
+#define HOSTMEMORY_H_INCLUDED
+
+extern int GPU_TEXWIDTH;
+
+extern u8* g_pBasePS2Mem;
+extern u8* g_pbyGSMemory;
+
+class GSMemory
+{
+	public:
+		void init();
+		void destroy();
+		u8* get();
+		u8* get(u32 addr);
+		u8* get_raw(u32 addr);
+};
+
+extern u8* g_pbyGSClut;		// the temporary clut buffer
+
+class GSClut
+{
+	public:
+		void init();
+		void destroy();
+		u8* get();
+		u8* get(u32 addr);
+		u8* get_raw(u32 addr);
+};
+
+// The size in bytes of x strings (of texture).
+inline int MemorySize(int x) 
+{
+	return 4 * GPU_TEXWIDTH * x;
+}
+
+// Return the address in memory of data block for string x. 
+inline u8* MemoryAddress(int x) 
+{
+	return g_pbyGSMemory + MemorySize(x);
+}
+
+template <u32 mult>
+inline u8* _MemoryAddress(int x) 
+{
+	return g_pbyGSMemory + mult * x;
+}
+
+extern void GetRectMemAddress(int& start, int& end, int psm, int x, int y, int w, int h, int bp, int bw);
+
+
+// called when trxdir is accessed. If host is involved, transfers memory to temp buffer byTransferBuf.
+// Otherwise performs the transfer. TODO: Perhaps divide the transfers into chunks?
+extern void InitTransferHostLocal();
+extern void TransferHostLocal(const void* pbyMem, u32 nQWordSize);
+
+extern void InitTransferLocalHost();
+extern void TransferLocalHost(void* pbyMem, u32 nQWordSize);
+
+extern void TransferLocalLocal();
+
+extern void TerminateLocalHost();
+extern void TerminateHostLocal();
+
+#endif // HOSTMEMORY_H_INCLUDED

plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp

@@ -106,6 +106,7 @@
 		<Unit filename="../../GifTransfer.cpp" />
 		<Unit filename="../../GifTransfer.h" />
 		<Unit filename="../../HostMemory.cpp" />
+		<Unit filename="../../HostMemory.h" />
 		<Unit filename="../Conf.cpp" />
 		<Unit filename="../Linux.cpp" />
 		<Unit filename="../Linux.h" />

plugins/zzogl-pg/opengl/NewRegs.cpp

@@ -869,7 +869,7 @@ void __gifCall GIFRegHandlerTRXDIR(const u32* data)
 	switch (gs.imageTransfer)
 	{
 		case 0: // host->loc
-			gs.imageTransfer = -1;
+			TerminateHostLocal();
 			break;
 
 		case 1: // loc->host

plugins/zzogl-pg/opengl/Regs.cpp

@@ -900,7 +900,7 @@ void __gifCall GIFRegHandlerTRXDIR(const u32* data)
 	{
 
 		case 0: // host->loc
-			gs.imageTransfer = -1;
+			TerminateHostLocal();
 			break;
 
 		case 1: // loc->host

plugins/zzogl-pg/opengl/zerogs.h

@@ -100,42 +100,8 @@ void SetFogColor(GIFRegFOGCOL* fog);
 void SaveTex(tex0Info* ptex, int usevid);
 char* NamedSaveTex(tex0Info* ptex, int usevid);
 
-// called when trxdir is accessed. If host is involved, transfers memory to temp buffer byTransferBuf.
-// Otherwise performs the transfer. TODO: Perhaps divide the transfers into chunks?
-void InitTransferHostLocal();
-void TransferHostLocal(const void* pbyMem, u32 nQWordSize);
-
-void InitTransferLocalHost();
-void TransferLocalHost(void* pbyMem, u32 nQWordSize);
-inline void TerminateLocalHost() {}
-
-void TransferLocalLocal();
-
 // switches the render target to the real target, flushes the current render targets and renders the real image
 void RenderCRTC(int interlace);
 void ResetRenderTarget(int index);
 
-
-// private methods
-
-// returns the first and last addresses aligned to a page that cover
-void GetRectMemAddress(int& start, int& end, int psm, int x, int y, int w, int h, int bp, int bw);
- 
-// The size in bytes of x strings (of texture).
-inline int MemorySize(int x) 
-{
-	return 4 * GPU_TEXWIDTH * x;
-}
-
-// Return the address in memory of data block for string x. 
-inline u8* MemoryAddress(int x) 
-{
-	return g_pbyGSMemory + MemorySize(x);
-}
-
-template <u32 mult>
-inline u8* _MemoryAddress(int x) 
-{
-	return g_pbyGSMemory + mult * x;
-}
 #endif