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

Apply the same visibility flags from CMake to CodeBlocks. GSnull: Remove some legacy gif code. Hook up the register code. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3618 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-08-07 05:46:25 +00:00
parent 02403e4c6d
commit 4cccc7a3b1
14 changed files with 142 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/build/Utilities/Utilities.cbp
View File

@ -127,6 +127,7 @@
<Add option="-fno-strict-aliasing" /> <Add option="-fno-strict-aliasing" />
<Add option="-pipe -msse -msse2" /> <Add option="-pipe -msse -msse2" />
<Add option="-m32" /> <Add option="-m32" />
<Add option="-fvisibility=hidden" />
<Add directory="../../include/Utilities" /> <Add directory="../../include/Utilities" />
<Add directory="../../include" /> <Add directory="../../include" />
<Add directory="../../../3rdparty" /> <Add directory="../../../3rdparty" />

1
common/build/x86emitter/x86emitter.cbp
View File

@ -130,6 +130,7 @@
<Add option="-fno-strict-aliasing" /> <Add option="-fno-strict-aliasing" />
<Add option="-pipe -msse -msse2" /> <Add option="-pipe -msse -msse2" />
<Add option="-m32" /> <Add option="-m32" />
<Add option="-fvisibility=hidden" />
<Add directory="../../include/x86emitter" /> <Add directory="../../include/x86emitter" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>

1
pcsx2/Linux/pcsx2.cbp
View File

@ -156,6 +156,7 @@
<Add option="-fno-strict-aliasing" /> <Add option="-fno-strict-aliasing" />
<Add option="-pipe -msse -msse2" /> <Add option="-pipe -msse -msse2" />
<Add option="-m32" /> <Add option="-m32" />
<Add option="-fvisibility=hidden" />
<Add option="-DWX_PRECOMP" /> <Add option="-DWX_PRECOMP" />
<Add directory="$(SvnRootDir)/common/include/" /> <Add directory="$(SvnRootDir)/common/include/" />
<Add directory="$(SvnRootDir)/3rdparty/" /> <Add directory="$(SvnRootDir)/3rdparty/" />

1
plugins/CDVDnull/Linux/CDVDnull.cbp
View File

@ -38,6 +38,7 @@
<Add option="`pkg-config gtk+-2.0 --cflags`" /> <Add option="`pkg-config gtk+-2.0 --cflags`" />
<Add option="-fPIC" /> <Add option="-fPIC" />
<Add option="-m32" /> <Add option="-m32" />
<Add option="-fvisibility=hidden" />
<Add directory="../Linux" /> <Add directory="../Linux" />
<Add directory="../../CDVDnull" /> <Add directory="../../CDVDnull" />
<Add directory="../../../common/include" /> <Add directory="../../../common/include" />

1
plugins/FWnull/Linux/FWnull.cbp
View File

@ -34,6 +34,7 @@
<Add option="`pkg-config gtk+-2.0 --cflags`" /> <Add option="`pkg-config gtk+-2.0 --cflags`" />
<Add option="-fPIC" /> <Add option="-fPIC" />
<Add option="-m32" /> <Add option="-m32" />
<Add option="-fvisibility=hidden" />
<Add directory="../../../common/include" /> <Add directory="../../../common/include" />
<Add directory="../Linux" /> <Add directory="../Linux" />
<Add directory="../../FWnull" /> <Add directory="../../FWnull" />

59
plugins/GSnull/GifTransfer.cpp
View File

@ -33,22 +33,16 @@ template<int index> void _GSgifTransfer(const u32 *pMem, u32 size)
// FUNCLOG // FUNCLOG
pathInfo *path = &gs.path[index]; pathInfo *path = &gs.path[index];
#ifdef _DEBUG
// [TODO] : Implement looging facilities?
//gifTransferLog(index, pMem, size);
#endif
while (size > 0) while (size > 0)
{ {
//LOG(_T("Transfer(%08x, %d) START\n"), pMem, size); //GS_LOG(_T("Transfer(%08x, %d) START\n"), pMem, size);
if (path->nloop == 0) if (path->nloop == 0)
{ {
path->setTag(pMem); path->setTag(pMem);
pMem += 4; pMem += 4;
size--; size--;
if ((conf.path3) && (index == 2) && path->eop) gs.nPath3Hack = 1;
// eeuser 7.2.2. GIFtag: "... when NLOOP is 0, the GIF does not output anything, and // eeuser 7.2.2. GIFtag: "... when NLOOP is 0, the GIF does not output anything, and
// values other than the EOP field are disregarded." // values other than the EOP field are disregarded."
if (path->nloop > 0) if (path->nloop > 0)
@ -58,7 +52,7 @@ template<int index> void _GSgifTransfer(const u32 *pMem, u32 size)
if (path->tag.PRE && (path->tag.FLG == GIF_FLG_PACKED)) if (path->tag.PRE && (path->tag.FLG == GIF_FLG_PACKED))
{ {
u32 tagprim = path->tag.PRIM; u32 tagprim = path->tag.PRIM;
//GIFRegHandlerPRIM((u32*)&tagprim); GIFRegHandlerPRIM((u32*)&tagprim);
} }
} }
} }
@ -68,8 +62,6 @@ template<int index> void _GSgifTransfer(const u32 *pMem, u32 size)
{ {
case GIF_FLG_PACKED: case GIF_FLG_PACKED:
{ {
// Needs to be looked at.
// first try a shortcut for a very common case // first try a shortcut for a very common case
if (path->adonly && size >= path->nloop) if (path->adonly && size >= path->nloop)
@ -78,7 +70,7 @@ template<int index> void _GSgifTransfer(const u32 *pMem, u32 size)
do do
{ {
//GIFPackedRegHandlerA_D(pMem); GIFPackedRegHandlerA_D(pMem);
pMem += 4; //sizeof(GIFPackedReg)/4; pMem += 4; //sizeof(GIFPackedReg)/4;
} }
@ -89,7 +81,7 @@ template<int index> void _GSgifTransfer(const u32 *pMem, u32 size)
do do
{ {
u32 reg = path->GetReg(); u32 reg = path->GetReg();
//g_GIFPackedRegHandlers[reg](pMem); GIFPackedRegHandlers[reg](pMem);
pMem += 4; //sizeof(GIFPackedReg)/4; pMem += 4; //sizeof(GIFPackedReg)/4;
size--; size--;
@ -101,14 +93,13 @@ template<int index> void _GSgifTransfer(const u32 *pMem, u32 size)
case GIF_FLG_REGLIST: case GIF_FLG_REGLIST:
{ {
// Needs to be looked at. //GS_Log("%8.8x%8.8x %d L", ((u32*)&gs.regs)[1], *(u32*)&gs.regs, path->tag.nreg/4);
//ZZLog::GS_Log("%8.8x%8.8x %d L", ((u32*)&gs.regs)[1], *(u32*)&gs.regs, path->tag.nreg/4);
size *= 2; size *= 2;
do do
{ {
//g_GIFRegHandlers[path->GetReg()](pMem); GIFRegHandlers[path->GetReg()](pMem);
pMem += 2; pMem += 2;
size--; size--;
@ -167,40 +158,15 @@ template<int index> void _GSgifTransfer(const u32 *pMem, u32 size)
break; break;
} }
} }
if (index == 0)
{
if (path->tag.EOP && path->nloop == 0)
{
break;
}
}
}
// This is the case when not all data was readed from one try: VU1 has too much data.
// So we should redo reading from the start.
if (index == 0)
{
if (size == 0 && path->nloop > 0)
{
if (gs.MultiThreaded)
{
path->nloop = 0;
}
else
{
_GSgifTransfer<0>(pMem - 0x4000, 0x4000 / 16);
}
}
} }
} }
#define DO_GIF_TRANSFERS #define DO_GIF_TRANSFERS
EXPORT_C_(void) GSgifTransfer1(u32 *pMem, u32 addr) EXPORT_C_(void) GSgifTransfer(const u32 *pMem, u32 size)
{ {
#ifdef DO_GIF_TRANSFERS #ifdef DO_GIF_TRANSFERS
_GSgifTransfer<0>((u32*)((u8*)pMem + addr), (0x4000 - addr) / 16); _GSgifTransfer<3>(const_cast<u32*>(pMem), size);
#endif #endif
} }
@ -218,13 +184,6 @@ EXPORT_C_(void) GSgifTransfer3(u32 *pMem, u32 size)
#endif #endif
} }
EXPORT_C_(void) GSgifTransfer(const u32 *pMem, u32 size)
{
#ifdef DO_GIF_TRANSFERS
_GSgifTransfer<3>(const_cast<u32*>(pMem), size);
#endif
}
void InitPath() void InitPath()
{ {
gs.path[0].mode = gs.path[1].mode = gs.path[2].mode = gs.path[3].mode = 0; gs.path[0].mode = gs.path[1].mode = gs.path[2].mode = gs.path[3].mode = 0;

5
plugins/GSnull/GifTransfer.h
View File

@ -124,7 +124,6 @@ extern void _GSgifPacket(pathInfo *path, const u32 *pMem);
extern void _GSgifRegList(pathInfo *path, const u32 *pMem); extern void _GSgifRegList(pathInfo *path, const u32 *pMem);
template<int index> template<int index>
extern void _GSgifTransfer(const u32 *pMem, u32 size); extern void _GSgifTransfer(const u32 *pMem, u32 size);
extern GIFRegHandler g_GIFPackedRegHandlers[]; extern GIFRegHandler GIFPackedRegHandlers[];
extern GIFRegHandler g_GIFRegHandlers[]; extern GIFRegHandler GIFRegHandlers[];
/*extern void InitPath();*/
#endif // GIFTRANSFER_H_INCLUDED #endif // GIFTRANSFER_H_INCLUDED

240
plugins/GSnull/Registers.cpp
View File

@ -19,8 +19,8 @@
#include "GS.h" #include "GS.h"
#include "Registers.h" #include "Registers.h"
GIFRegHandler g_GIFPackedRegHandlers[16]; GIFRegHandler GIFPackedRegHandlers[16];
GIFRegHandler g_GIFRegHandlers[256]; GIFRegHandler GIFRegHandlers[256];
// For now, I'm just rigging this up to store all the register information coming in, without doing // For now, I'm just rigging this up to store all the register information coming in, without doing
// any of the normal processing. // any of the normal processing.
@ -107,7 +107,7 @@ void __gifCall GIFPackedRegHandlerA_D(const u32* data)
{ {
GIFPackedA_D* r = (GIFPackedA_D*)(data); GIFPackedA_D* r = (GIFPackedA_D*)(data);
g_GIFRegHandlers[r->ADDR](data); GIFRegHandlers[r->ADDR](data);
} }
void __gifCall GIFPackedRegHandlerNOP(const u32* data) void __gifCall GIFPackedRegHandlerNOP(const u32* data)
@ -396,15 +396,15 @@ void SetMultithreaded()
if (gs.MultiThreaded) if (gs.MultiThreaded)
{ {
g_GIFRegHandlers[GIF_A_D_REG_SIGNAL] = &GIFRegHandlerNull; GIFRegHandlers[GIF_A_D_REG_SIGNAL] = &GIFRegHandlerNull;
g_GIFRegHandlers[GIF_A_D_REG_FINISH] = &GIFRegHandlerNull; GIFRegHandlers[GIF_A_D_REG_FINISH] = &GIFRegHandlerNull;
g_GIFRegHandlers[GIF_A_D_REG_LABEL] = &GIFRegHandlerNull; GIFRegHandlers[GIF_A_D_REG_LABEL] = &GIFRegHandlerNull;
} }
else else
{ {
g_GIFRegHandlers[GIF_A_D_REG_SIGNAL] = &GIFRegHandlerSIGNAL; GIFRegHandlers[GIF_A_D_REG_SIGNAL] = &GIFRegHandlerSIGNAL;
g_GIFRegHandlers[GIF_A_D_REG_FINISH] = &GIFRegHandlerFINISH; GIFRegHandlers[GIF_A_D_REG_FINISH] = &GIFRegHandlerFINISH;
g_GIFRegHandlers[GIF_A_D_REG_LABEL] = &GIFRegHandlerLABEL; GIFRegHandlers[GIF_A_D_REG_LABEL] = &GIFRegHandlerLABEL;
} }
} }
@ -412,82 +412,82 @@ void ResetRegs()
{ {
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
{ {
g_GIFPackedRegHandlers[i] = &GIFPackedRegHandlerNull; GIFPackedRegHandlers[i] = &GIFPackedRegHandlerNull;
} }
g_GIFPackedRegHandlers[GIF_REG_PRIM] = &GIFPackedRegHandlerPRIM; GIFPackedRegHandlers[GIF_REG_PRIM] = &GIFPackedRegHandlerPRIM;
g_GIFPackedRegHandlers[GIF_REG_RGBA] = &GIFPackedRegHandlerRGBA; GIFPackedRegHandlers[GIF_REG_RGBA] = &GIFPackedRegHandlerRGBA;
g_GIFPackedRegHandlers[GIF_REG_STQ] = &GIFPackedRegHandlerSTQ; GIFPackedRegHandlers[GIF_REG_STQ] = &GIFPackedRegHandlerSTQ;
g_GIFPackedRegHandlers[GIF_REG_UV] = &GIFPackedRegHandlerUV; GIFPackedRegHandlers[GIF_REG_UV] = &GIFPackedRegHandlerUV;
g_GIFPackedRegHandlers[GIF_REG_XYZF2] = &GIFPackedRegHandlerXYZF2; GIFPackedRegHandlers[GIF_REG_XYZF2] = &GIFPackedRegHandlerXYZF2;
g_GIFPackedRegHandlers[GIF_REG_XYZ2] = &GIFPackedRegHandlerXYZ2; GIFPackedRegHandlers[GIF_REG_XYZ2] = &GIFPackedRegHandlerXYZ2;
g_GIFPackedRegHandlers[GIF_REG_TEX0_1] = &GIFPackedRegHandlerTEX0<0>; GIFPackedRegHandlers[GIF_REG_TEX0_1] = &GIFPackedRegHandlerTEX0<0>;
g_GIFPackedRegHandlers[GIF_REG_TEX0_2] = &GIFPackedRegHandlerTEX0<1>; GIFPackedRegHandlers[GIF_REG_TEX0_2] = &GIFPackedRegHandlerTEX0<1>;
g_GIFPackedRegHandlers[GIF_REG_CLAMP_1] = &GIFPackedRegHandlerCLAMP<0>; GIFPackedRegHandlers[GIF_REG_CLAMP_1] = &GIFPackedRegHandlerCLAMP<0>;
g_GIFPackedRegHandlers[GIF_REG_CLAMP_2] = &GIFPackedRegHandlerCLAMP<1>; GIFPackedRegHandlers[GIF_REG_CLAMP_2] = &GIFPackedRegHandlerCLAMP<1>;
g_GIFPackedRegHandlers[GIF_REG_FOG] = &GIFPackedRegHandlerFOG; GIFPackedRegHandlers[GIF_REG_FOG] = &GIFPackedRegHandlerFOG;
g_GIFPackedRegHandlers[GIF_REG_XYZF3] = &GIFPackedRegHandlerXYZF3; GIFPackedRegHandlers[GIF_REG_XYZF3] = &GIFPackedRegHandlerXYZF3;
g_GIFPackedRegHandlers[GIF_REG_XYZ3] = &GIFPackedRegHandlerXYZ3; GIFPackedRegHandlers[GIF_REG_XYZ3] = &GIFPackedRegHandlerXYZ3;
g_GIFPackedRegHandlers[GIF_REG_A_D] = &GIFPackedRegHandlerA_D; GIFPackedRegHandlers[GIF_REG_A_D] = &GIFPackedRegHandlerA_D;
g_GIFPackedRegHandlers[GIF_REG_NOP] = &GIFPackedRegHandlerNOP; GIFPackedRegHandlers[GIF_REG_NOP] = &GIFPackedRegHandlerNOP;
for (int i = 0; i < 256; i++) for (int i = 0; i < 256; i++)
{ {
g_GIFRegHandlers[i] = &GIFPackedRegHandlerNull; GIFRegHandlers[i] = &GIFRegHandlerNull;
} }
g_GIFRegHandlers[GIF_A_D_REG_PRIM] = &GIFRegHandlerPRIM; GIFRegHandlers[GIF_A_D_REG_PRIM] = &GIFRegHandlerPRIM;
g_GIFRegHandlers[GIF_A_D_REG_RGBAQ] = &GIFRegHandlerRGBAQ; GIFRegHandlers[GIF_A_D_REG_RGBAQ] = &GIFRegHandlerRGBAQ;
g_GIFRegHandlers[GIF_A_D_REG_ST] = &GIFRegHandlerST; GIFRegHandlers[GIF_A_D_REG_ST] = &GIFRegHandlerST;
g_GIFRegHandlers[GIF_A_D_REG_UV] = &GIFRegHandlerUV; GIFRegHandlers[GIF_A_D_REG_UV] = &GIFRegHandlerUV;
g_GIFRegHandlers[GIF_A_D_REG_XYZF2] = &GIFRegHandlerXYZF2; GIFRegHandlers[GIF_A_D_REG_XYZF2] = &GIFRegHandlerXYZF2;
g_GIFRegHandlers[GIF_A_D_REG_XYZ2] = &GIFRegHandlerXYZ2; GIFRegHandlers[GIF_A_D_REG_XYZ2] = &GIFRegHandlerXYZ2;
g_GIFRegHandlers[GIF_A_D_REG_TEX0_1] = &GIFRegHandlerTEX0<0>; GIFRegHandlers[GIF_A_D_REG_TEX0_1] = &GIFRegHandlerTEX0<0>;
g_GIFRegHandlers[GIF_A_D_REG_TEX0_2] = &GIFRegHandlerTEX0<1>; GIFRegHandlers[GIF_A_D_REG_TEX0_2] = &GIFRegHandlerTEX0<1>;
g_GIFRegHandlers[GIF_A_D_REG_CLAMP_1] = &GIFRegHandlerCLAMP<0>; GIFRegHandlers[GIF_A_D_REG_CLAMP_1] = &GIFRegHandlerCLAMP<0>;
g_GIFRegHandlers[GIF_A_D_REG_CLAMP_2] = &GIFRegHandlerCLAMP<1>; GIFRegHandlers[GIF_A_D_REG_CLAMP_2] = &GIFRegHandlerCLAMP<1>;
g_GIFRegHandlers[GIF_A_D_REG_FOG] = &GIFRegHandlerFOG; GIFRegHandlers[GIF_A_D_REG_FOG] = &GIFRegHandlerFOG;
g_GIFRegHandlers[GIF_A_D_REG_XYZF3] = &GIFRegHandlerXYZF3; GIFRegHandlers[GIF_A_D_REG_XYZF3] = &GIFRegHandlerXYZF3;
g_GIFRegHandlers[GIF_A_D_REG_XYZ3] = &GIFRegHandlerXYZ3; GIFRegHandlers[GIF_A_D_REG_XYZ3] = &GIFRegHandlerXYZ3;
g_GIFRegHandlers[GIF_A_D_REG_NOP] = &GIFRegHandlerNOP; GIFRegHandlers[GIF_A_D_REG_NOP] = &GIFRegHandlerNOP;
g_GIFRegHandlers[GIF_A_D_REG_TEX1_1] = &GIFRegHandlerTEX1<0>; GIFRegHandlers[GIF_A_D_REG_TEX1_1] = &GIFRegHandlerTEX1<0>;
g_GIFRegHandlers[GIF_A_D_REG_TEX1_2] = &GIFRegHandlerTEX1<1>; GIFRegHandlers[GIF_A_D_REG_TEX1_2] = &GIFRegHandlerTEX1<1>;
g_GIFRegHandlers[GIF_A_D_REG_TEX2_1] = &GIFRegHandlerTEX2<0>; GIFRegHandlers[GIF_A_D_REG_TEX2_1] = &GIFRegHandlerTEX2<0>;
g_GIFRegHandlers[GIF_A_D_REG_TEX2_2] = &GIFRegHandlerTEX2<1>; GIFRegHandlers[GIF_A_D_REG_TEX2_2] = &GIFRegHandlerTEX2<1>;
g_GIFRegHandlers[GIF_A_D_REG_XYOFFSET_1] = &GIFRegHandlerXYOFFSET<0>; GIFRegHandlers[GIF_A_D_REG_XYOFFSET_1] = &GIFRegHandlerXYOFFSET<0>;
g_GIFRegHandlers[GIF_A_D_REG_XYOFFSET_2] = &GIFRegHandlerXYOFFSET<1>; GIFRegHandlers[GIF_A_D_REG_XYOFFSET_2] = &GIFRegHandlerXYOFFSET<1>;
g_GIFRegHandlers[GIF_A_D_REG_PRMODECONT] = &GIFRegHandlerPRMODECONT; GIFRegHandlers[GIF_A_D_REG_PRMODECONT] = &GIFRegHandlerPRMODECONT;
g_GIFRegHandlers[GIF_A_D_REG_PRMODE] = &GIFRegHandlerPRMODE; GIFRegHandlers[GIF_A_D_REG_PRMODE] = &GIFRegHandlerPRMODE;
g_GIFRegHandlers[GIF_A_D_REG_TEXCLUT] = &GIFRegHandlerTEXCLUT; GIFRegHandlers[GIF_A_D_REG_TEXCLUT] = &GIFRegHandlerTEXCLUT;
g_GIFRegHandlers[GIF_A_D_REG_SCANMSK] = &GIFRegHandlerSCANMSK; GIFRegHandlers[GIF_A_D_REG_SCANMSK] = &GIFRegHandlerSCANMSK;
g_GIFRegHandlers[GIF_A_D_REG_MIPTBP1_1] = &GIFRegHandlerMIPTBP1<0>; GIFRegHandlers[GIF_A_D_REG_MIPTBP1_1] = &GIFRegHandlerMIPTBP1<0>;
g_GIFRegHandlers[GIF_A_D_REG_MIPTBP1_2] = &GIFRegHandlerMIPTBP1<1>; GIFRegHandlers[GIF_A_D_REG_MIPTBP1_2] = &GIFRegHandlerMIPTBP1<1>;
g_GIFRegHandlers[GIF_A_D_REG_MIPTBP2_1] = &GIFRegHandlerMIPTBP2<0>; GIFRegHandlers[GIF_A_D_REG_MIPTBP2_1] = &GIFRegHandlerMIPTBP2<0>;
g_GIFRegHandlers[GIF_A_D_REG_MIPTBP2_2] = &GIFRegHandlerMIPTBP2<1>; GIFRegHandlers[GIF_A_D_REG_MIPTBP2_2] = &GIFRegHandlerMIPTBP2<1>;
g_GIFRegHandlers[GIF_A_D_REG_TEXA] = &GIFRegHandlerTEXA; GIFRegHandlers[GIF_A_D_REG_TEXA] = &GIFRegHandlerTEXA;
g_GIFRegHandlers[GIF_A_D_REG_FOGCOL] = &GIFRegHandlerFOGCOL; GIFRegHandlers[GIF_A_D_REG_FOGCOL] = &GIFRegHandlerFOGCOL;
g_GIFRegHandlers[GIF_A_D_REG_TEXFLUSH] = &GIFRegHandlerTEXFLUSH; GIFRegHandlers[GIF_A_D_REG_TEXFLUSH] = &GIFRegHandlerTEXFLUSH;
g_GIFRegHandlers[GIF_A_D_REG_SCISSOR_1] = &GIFRegHandlerSCISSOR<0>; GIFRegHandlers[GIF_A_D_REG_SCISSOR_1] = &GIFRegHandlerSCISSOR<0>;
g_GIFRegHandlers[GIF_A_D_REG_SCISSOR_2] = &GIFRegHandlerSCISSOR<1>; GIFRegHandlers[GIF_A_D_REG_SCISSOR_2] = &GIFRegHandlerSCISSOR<1>;
g_GIFRegHandlers[GIF_A_D_REG_ALPHA_1] = &GIFRegHandlerALPHA<0>; GIFRegHandlers[GIF_A_D_REG_ALPHA_1] = &GIFRegHandlerALPHA<0>;
g_GIFRegHandlers[GIF_A_D_REG_ALPHA_2] = &GIFRegHandlerALPHA<1>; GIFRegHandlers[GIF_A_D_REG_ALPHA_2] = &GIFRegHandlerALPHA<1>;
g_GIFRegHandlers[GIF_A_D_REG_DIMX] = &GIFRegHandlerDIMX; GIFRegHandlers[GIF_A_D_REG_DIMX] = &GIFRegHandlerDIMX;
g_GIFRegHandlers[GIF_A_D_REG_DTHE] = &GIFRegHandlerDTHE; GIFRegHandlers[GIF_A_D_REG_DTHE] = &GIFRegHandlerDTHE;
g_GIFRegHandlers[GIF_A_D_REG_COLCLAMP] = &GIFRegHandlerCOLCLAMP; GIFRegHandlers[GIF_A_D_REG_COLCLAMP] = &GIFRegHandlerCOLCLAMP;
g_GIFRegHandlers[GIF_A_D_REG_TEST_1] = &GIFRegHandlerTEST<0>; GIFRegHandlers[GIF_A_D_REG_TEST_1] = &GIFRegHandlerTEST<0>;
g_GIFRegHandlers[GIF_A_D_REG_TEST_2] = &GIFRegHandlerTEST<1>; GIFRegHandlers[GIF_A_D_REG_TEST_2] = &GIFRegHandlerTEST<1>;
g_GIFRegHandlers[GIF_A_D_REG_PABE] = &GIFRegHandlerPABE; GIFRegHandlers[GIF_A_D_REG_PABE] = &GIFRegHandlerPABE;
g_GIFRegHandlers[GIF_A_D_REG_FBA_1] = &GIFRegHandlerFBA<0>; GIFRegHandlers[GIF_A_D_REG_FBA_1] = &GIFRegHandlerFBA<0>;
g_GIFRegHandlers[GIF_A_D_REG_FBA_2] = &GIFRegHandlerFBA<1>; GIFRegHandlers[GIF_A_D_REG_FBA_2] = &GIFRegHandlerFBA<1>;
g_GIFRegHandlers[GIF_A_D_REG_FRAME_1] = &GIFRegHandlerFRAME<0>; GIFRegHandlers[GIF_A_D_REG_FRAME_1] = &GIFRegHandlerFRAME<0>;
g_GIFRegHandlers[GIF_A_D_REG_FRAME_2] = &GIFRegHandlerFRAME<1>; GIFRegHandlers[GIF_A_D_REG_FRAME_2] = &GIFRegHandlerFRAME<1>;
g_GIFRegHandlers[GIF_A_D_REG_ZBUF_1] = &GIFRegHandlerZBUF<0>; GIFRegHandlers[GIF_A_D_REG_ZBUF_1] = &GIFRegHandlerZBUF<0>;
g_GIFRegHandlers[GIF_A_D_REG_ZBUF_2] = &GIFRegHandlerZBUF<1>; GIFRegHandlers[GIF_A_D_REG_ZBUF_2] = &GIFRegHandlerZBUF<1>;
g_GIFRegHandlers[GIF_A_D_REG_BITBLTBUF] = &GIFRegHandlerBITBLTBUF; GIFRegHandlers[GIF_A_D_REG_BITBLTBUF] = &GIFRegHandlerBITBLTBUF;
g_GIFRegHandlers[GIF_A_D_REG_TRXPOS] = &GIFRegHandlerTRXPOS; GIFRegHandlers[GIF_A_D_REG_TRXPOS] = &GIFRegHandlerTRXPOS;
g_GIFRegHandlers[GIF_A_D_REG_TRXREG] = &GIFRegHandlerTRXREG; GIFRegHandlers[GIF_A_D_REG_TRXREG] = &GIFRegHandlerTRXREG;
g_GIFRegHandlers[GIF_A_D_REG_TRXDIR] = &GIFRegHandlerTRXDIR; GIFRegHandlers[GIF_A_D_REG_TRXDIR] = &GIFRegHandlerTRXDIR;
g_GIFRegHandlers[GIF_A_D_REG_HWREG] = &GIFRegHandlerHWREG; GIFRegHandlers[GIF_A_D_REG_HWREG] = &GIFRegHandlerHWREG;
SetMultithreaded(); SetMultithreaded();
} }
@ -495,52 +495,52 @@ void SetFrameSkip(bool skip)
{ {
if (skip) if (skip)
{ {
g_GIFPackedRegHandlers[GIF_REG_PRIM] = &GIFPackedRegHandlerNOP; GIFPackedRegHandlers[GIF_REG_PRIM] = &GIFPackedRegHandlerNOP;
g_GIFPackedRegHandlers[GIF_REG_RGBA] = &GIFPackedRegHandlerNOP; GIFPackedRegHandlers[GIF_REG_RGBA] = &GIFPackedRegHandlerNOP;
g_GIFPackedRegHandlers[GIF_REG_STQ] = &GIFPackedRegHandlerNOP; GIFPackedRegHandlers[GIF_REG_STQ] = &GIFPackedRegHandlerNOP;
g_GIFPackedRegHandlers[GIF_REG_UV] = &GIFPackedRegHandlerNOP; GIFPackedRegHandlers[GIF_REG_UV] = &GIFPackedRegHandlerNOP;
g_GIFPackedRegHandlers[GIF_REG_XYZF2] = &GIFPackedRegHandlerNOP; GIFPackedRegHandlers[GIF_REG_XYZF2] = &GIFPackedRegHandlerNOP;
g_GIFPackedRegHandlers[GIF_REG_XYZ2] = &GIFPackedRegHandlerNOP; GIFPackedRegHandlers[GIF_REG_XYZ2] = &GIFPackedRegHandlerNOP;
g_GIFPackedRegHandlers[GIF_REG_CLAMP_1] = &GIFPackedRegHandlerNOP; GIFPackedRegHandlers[GIF_REG_CLAMP_1] = &GIFPackedRegHandlerNOP;
g_GIFPackedRegHandlers[GIF_REG_CLAMP_2] = &GIFPackedRegHandlerNOP; GIFPackedRegHandlers[GIF_REG_CLAMP_2] = &GIFPackedRegHandlerNOP;
g_GIFPackedRegHandlers[GIF_REG_FOG] = &GIFPackedRegHandlerNOP; GIFPackedRegHandlers[GIF_REG_FOG] = &GIFPackedRegHandlerNOP;
g_GIFPackedRegHandlers[GIF_REG_XYZF3] = &GIFPackedRegHandlerNOP; GIFPackedRegHandlers[GIF_REG_XYZF3] = &GIFPackedRegHandlerNOP;
g_GIFPackedRegHandlers[GIF_REG_XYZ3] = &GIFPackedRegHandlerNOP; GIFPackedRegHandlers[GIF_REG_XYZ3] = &GIFPackedRegHandlerNOP;
g_GIFRegHandlers[GIF_A_D_REG_PRIM] = &GIFRegHandlerNOP; GIFRegHandlers[GIF_A_D_REG_PRIM] = &GIFRegHandlerNOP;
g_GIFRegHandlers[GIF_A_D_REG_RGBAQ] = &GIFRegHandlerNOP; GIFRegHandlers[GIF_A_D_REG_RGBAQ] = &GIFRegHandlerNOP;
g_GIFRegHandlers[GIF_A_D_REG_ST] = &GIFRegHandlerNOP; GIFRegHandlers[GIF_A_D_REG_ST] = &GIFRegHandlerNOP;
g_GIFRegHandlers[GIF_A_D_REG_UV] = &GIFRegHandlerNOP; GIFRegHandlers[GIF_A_D_REG_UV] = &GIFRegHandlerNOP;
g_GIFRegHandlers[GIF_A_D_REG_XYZF2] = &GIFRegHandlerNOP; GIFRegHandlers[GIF_A_D_REG_XYZF2] = &GIFRegHandlerNOP;
g_GIFRegHandlers[GIF_A_D_REG_XYZ2] = &GIFRegHandlerNOP; GIFRegHandlers[GIF_A_D_REG_XYZ2] = &GIFRegHandlerNOP;
g_GIFRegHandlers[GIF_A_D_REG_XYZF3] = &GIFRegHandlerNOP; GIFRegHandlers[GIF_A_D_REG_XYZF3] = &GIFRegHandlerNOP;
g_GIFRegHandlers[GIF_A_D_REG_XYZ3] = &GIFRegHandlerNOP; GIFRegHandlers[GIF_A_D_REG_XYZ3] = &GIFRegHandlerNOP;
g_GIFRegHandlers[GIF_A_D_REG_PRMODECONT] = &GIFRegHandlerNOP; GIFRegHandlers[GIF_A_D_REG_PRMODECONT] = &GIFRegHandlerNOP;
g_GIFRegHandlers[GIF_A_D_REG_PRMODE] = &GIFRegHandlerNOP; GIFRegHandlers[GIF_A_D_REG_PRMODE] = &GIFRegHandlerNOP;
} }
else else
{ {
g_GIFPackedRegHandlers[GIF_REG_PRIM] = &GIFPackedRegHandlerPRIM; GIFPackedRegHandlers[GIF_REG_PRIM] = &GIFPackedRegHandlerPRIM;
g_GIFPackedRegHandlers[GIF_REG_RGBA] = &GIFPackedRegHandlerRGBA; GIFPackedRegHandlers[GIF_REG_RGBA] = &GIFPackedRegHandlerRGBA;
g_GIFPackedRegHandlers[GIF_REG_STQ] = &GIFPackedRegHandlerSTQ; GIFPackedRegHandlers[GIF_REG_STQ] = &GIFPackedRegHandlerSTQ;
g_GIFPackedRegHandlers[GIF_REG_UV] = &GIFPackedRegHandlerUV; GIFPackedRegHandlers[GIF_REG_UV] = &GIFPackedRegHandlerUV;
g_GIFPackedRegHandlers[GIF_REG_XYZF2] = &GIFPackedRegHandlerXYZF2; GIFPackedRegHandlers[GIF_REG_XYZF2] = &GIFPackedRegHandlerXYZF2;
g_GIFPackedRegHandlers[GIF_REG_XYZ2] = &GIFPackedRegHandlerXYZ2; GIFPackedRegHandlers[GIF_REG_XYZ2] = &GIFPackedRegHandlerXYZ2;
g_GIFPackedRegHandlers[GIF_REG_CLAMP_1] = &GIFPackedRegHandlerCLAMP<0>; GIFPackedRegHandlers[GIF_REG_CLAMP_1] = &GIFPackedRegHandlerCLAMP<0>;
g_GIFPackedRegHandlers[GIF_REG_CLAMP_2] = &GIFPackedRegHandlerCLAMP<1>; GIFPackedRegHandlers[GIF_REG_CLAMP_2] = &GIFPackedRegHandlerCLAMP<1>;
g_GIFPackedRegHandlers[GIF_REG_FOG] = &GIFPackedRegHandlerFOG; GIFPackedRegHandlers[GIF_REG_FOG] = &GIFPackedRegHandlerFOG;
g_GIFPackedRegHandlers[GIF_REG_XYZF3] = &GIFPackedRegHandlerXYZF3; GIFPackedRegHandlers[GIF_REG_XYZF3] = &GIFPackedRegHandlerXYZF3;
g_GIFPackedRegHandlers[GIF_REG_XYZ3] = &GIFPackedRegHandlerXYZ3; GIFPackedRegHandlers[GIF_REG_XYZ3] = &GIFPackedRegHandlerXYZ3;
g_GIFRegHandlers[GIF_A_D_REG_PRIM] = &GIFRegHandlerPRIM; GIFRegHandlers[GIF_A_D_REG_PRIM] = &GIFRegHandlerPRIM;
g_GIFRegHandlers[GIF_A_D_REG_RGBAQ] = &GIFRegHandlerRGBAQ; GIFRegHandlers[GIF_A_D_REG_RGBAQ] = &GIFRegHandlerRGBAQ;
g_GIFRegHandlers[GIF_A_D_REG_ST] = &GIFRegHandlerST; GIFRegHandlers[GIF_A_D_REG_ST] = &GIFRegHandlerST;
g_GIFRegHandlers[GIF_A_D_REG_UV] = &GIFRegHandlerUV; GIFRegHandlers[GIF_A_D_REG_UV] = &GIFRegHandlerUV;
g_GIFRegHandlers[GIF_A_D_REG_XYZF2] = &GIFRegHandlerXYZF2; GIFRegHandlers[GIF_A_D_REG_XYZF2] = &GIFRegHandlerXYZF2;
g_GIFRegHandlers[GIF_A_D_REG_XYZ2] = &GIFRegHandlerXYZ2; GIFRegHandlers[GIF_A_D_REG_XYZ2] = &GIFRegHandlerXYZ2;
g_GIFRegHandlers[GIF_A_D_REG_XYZF3] = &GIFRegHandlerXYZF3; GIFRegHandlers[GIF_A_D_REG_XYZF3] = &GIFRegHandlerXYZF3;
g_GIFRegHandlers[GIF_A_D_REG_XYZ3] = &GIFRegHandlerXYZ3; GIFRegHandlers[GIF_A_D_REG_XYZ3] = &GIFRegHandlerXYZ3;
g_GIFRegHandlers[GIF_A_D_REG_PRMODECONT] = &GIFRegHandlerPRMODECONT; GIFRegHandlers[GIF_A_D_REG_PRMODECONT] = &GIFRegHandlerPRMODECONT;
g_GIFRegHandlers[GIF_A_D_REG_PRMODE] = &GIFRegHandlerPRMODE; GIFRegHandlers[GIF_A_D_REG_PRMODE] = &GIFRegHandlerPRMODE;
} }
} }

1
plugins/PadNull/Linux/PadNull.cbp
View File

@ -38,6 +38,7 @@
<Add option="`pkg-config gtk+-2.0 --cflags`" /> <Add option="`pkg-config gtk+-2.0 --cflags`" />
<Add option="-fPIC" /> <Add option="-fPIC" />
<Add option="-m32" /> <Add option="-m32" />
<Add option="-fvisibility=hidden" />
<Add directory="../Linux" /> <Add directory="../Linux" />
<Add directory="../../PadNull" /> <Add directory="../../PadNull" />
<Add directory="../../../common/include" /> <Add directory="../../../common/include" />

1
plugins/SPU2null/Linux/SPU2null.cbp
View File

@ -44,6 +44,7 @@
<Add option="`pkg-config gtk+-2.0 --cflags`" /> <Add option="`pkg-config gtk+-2.0 --cflags`" />
<Add option="-fPIC" /> <Add option="-fPIC" />
<Add option="-m32" /> <Add option="-m32" />
<Add option="-fvisibility=hidden" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="`pkg-config gtk+-2.0 --libs`" /> <Add option="`pkg-config gtk+-2.0 --libs`" />

1
plugins/USBnull/Linux/USBnull.cbp
View File

@ -38,6 +38,7 @@
<Add option="`pkg-config gtk+-2.0 --cflags`" /> <Add option="`pkg-config gtk+-2.0 --cflags`" />
<Add option="-fPIC" /> <Add option="-fPIC" />
<Add option="-m32" /> <Add option="-m32" />
<Add option="-fvisibility=hidden" />
<Add directory="../Linux" /> <Add directory="../Linux" />
<Add directory="../../USBnull" /> <Add directory="../../USBnull" />
<Add directory="../../../common/include" /> <Add directory="../../../common/include" />

1
plugins/dev9null/Linux/Dev9null.cbp
View File

@ -38,6 +38,7 @@
<Add option="`pkg-config gtk+-2.0 --cflags`" /> <Add option="`pkg-config gtk+-2.0 --cflags`" />
<Add option="-fPIC" /> <Add option="-fPIC" />
<Add option="-m32" /> <Add option="-m32" />
<Add option="-fvisibility=hidden" />
<Add directory="../Linux" /> <Add directory="../Linux" />
<Add directory="../../dev9null" /> <Add directory="../../dev9null" />
<Add directory="../../../common/include" /> <Add directory="../../../common/include" />

1
plugins/onepad/Linux/OnePad.cbp
View File

@ -39,6 +39,7 @@
<Add option="`pkg-config sdl --cflags`" /> <Add option="`pkg-config sdl --cflags`" />
<Add option="-fPIC" /> <Add option="-fPIC" />
<Add option="-m32" /> <Add option="-m32" />
<Add option="-fvisibility=hidden" />
<Add directory="../Linux" /> <Add directory="../Linux" />
<Add directory="../../onepad" /> <Add directory="../../onepad" />
<Add directory="../../../common/include" /> <Add directory="../../../common/include" />

1
plugins/spu2-x/src/Linux/SPU2-X.cbp
View File

@ -48,6 +48,7 @@
<Add option="-m32" /> <Add option="-m32" />
<Add option="-liconv" /> <Add option="-liconv" />
<Add option="-msse2" /> <Add option="-msse2" />
<Add option="-fvisibility=hidden" />
<Add directory="../Linux" /> <Add directory="../Linux" />
<Add directory="../../src" /> <Add directory="../../src" />
<Add directory="../../../../common/include" /> <Add directory="../../../../common/include" />