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

ReorderingMTGS: zzogl-pg: Add GSgifTransfer. pcsx2: Add an include so Linux compiles. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/ReorderingMTGS@3459 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-07-11 06:16:16 +00:00
parent a9084741bc
commit 472358345a
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/include/PS2Edefs.h
View File

@ -248,6 +248,7 @@ void CALLBACK GSsetSettingsDir( const char* dir );
void CALLBACK GSsetLogDir( const char* dir ); void CALLBACK GSsetLogDir( const char* dir );
void CALLBACK GSvsync(int field); void CALLBACK GSvsync(int field);
void CALLBACK GSgifTransfer(u32 *pMem, u32 addr);
void CALLBACK GSgifTransfer1(u32 *pMem, u32 addr); void CALLBACK GSgifTransfer1(u32 *pMem, u32 addr);
void CALLBACK GSgifTransfer2(u32 *pMem, u32 size); void CALLBACK GSgifTransfer2(u32 *pMem, u32 size);
void CALLBACK GSgifTransfer3(u32 *pMem, u32 size); void CALLBACK GSgifTransfer3(u32 *pMem, u32 size);

1
pcsx2/ps2/GIFpath.cpp
View File

@ -19,6 +19,7 @@
#include "Gif.h" #include "Gif.h"
#include "Vif_Dma.h" #include "Vif_Dma.h"
#include "Vif.h" #include "Vif.h"
#include <xmmintrin.h>
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// GIFpath -- the GIFtag Parser // GIFpath -- the GIFtag Parser

2
plugins/zzogl-pg/opengl/GS.h
View File

@ -635,7 +635,7 @@ typedef struct
int imageTransfer; int imageTransfer;
int imageWnew, imageHnew, imageX, imageY, imageEndX, imageEndY; int imageWnew, imageHnew, imageX, imageY, imageEndX, imageEndY;
pathInfo path[3]; pathInfo path[4];
GIFRegDIMX dimx; GIFRegDIMX dimx;
void setRGBA(u32 r, u32 g, u32 b, u32 a) void setRGBA(u32 r, u32 g, u32 b, u32 a)
{ {

13
plugins/zzogl-pg/opengl/GifTransfer.cpp
View File

@ -265,8 +265,17 @@ void CALLBACK GSgifTransfer3(u32 *pMem, u32 size)
_GSgifTransfer<2>(pMem, size); _GSgifTransfer<2>(pMem, size);
} }
void InitPath() void CALLBACK GSgifTransfer(u32 *pMem, u32 size)
{ {
gs.path[0].mode = gs.path[1].mode = gs.path[2].mode = 0; FUNCLOG
//ZZLog::GS_Log("GSgifTransfer3 size = %lx (mode %d, gs.path3.tag.nloop = %d).", size, gs.path[2].mode, gs.path[2].tag.nloop);
_GSgifTransfer<3>(pMem, size);
}
void InitPath()
{
gs.path[0].mode = gs.path[1].mode = gs.path[2].mode = gs.path[3].mode = 0;
} }