From 4cccc7a3b11bb8cfdaf405acc247fd120d7da3d2 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Sat, 7 Aug 2010 05:46:25 +0000 Subject: [PATCH] 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 --- common/build/Utilities/Utilities.cbp | 1 + common/build/x86emitter/x86emitter.cbp | 1 + pcsx2/Linux/pcsx2.cbp | 1 + plugins/CDVDnull/Linux/CDVDnull.cbp | 1 + plugins/FWnull/Linux/FWnull.cbp | 1 + plugins/GSnull/GifTransfer.cpp | 59 +----- plugins/GSnull/GifTransfer.h | 5 +- plugins/GSnull/Registers.cpp | 240 ++++++++++++------------- plugins/PadNull/Linux/PadNull.cbp | 1 + plugins/SPU2null/Linux/SPU2null.cbp | 1 + plugins/USBnull/Linux/USBnull.cbp | 1 + plugins/dev9null/Linux/Dev9null.cbp | 1 + plugins/onepad/Linux/OnePad.cbp | 1 + plugins/spu2-x/src/Linux/SPU2-X.cbp | 1 + 14 files changed, 142 insertions(+), 173 deletions(-) diff --git a/common/build/Utilities/Utilities.cbp b/common/build/Utilities/Utilities.cbp index 5ae5b5bb76..4ee3d0b232 100644 --- a/common/build/Utilities/Utilities.cbp +++ b/common/build/Utilities/Utilities.cbp @@ -127,6 +127,7 @@ + diff --git a/common/build/x86emitter/x86emitter.cbp b/common/build/x86emitter/x86emitter.cbp index a5ac0ed6d8..d88ac86bbe 100644 --- a/common/build/x86emitter/x86emitter.cbp +++ b/common/build/x86emitter/x86emitter.cbp @@ -130,6 +130,7 @@ + diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp index 6b6640528b..71be9c287d 100644 --- a/pcsx2/Linux/pcsx2.cbp +++ b/pcsx2/Linux/pcsx2.cbp @@ -156,6 +156,7 @@ + diff --git a/plugins/CDVDnull/Linux/CDVDnull.cbp b/plugins/CDVDnull/Linux/CDVDnull.cbp index 34125156a7..ae190cd106 100644 --- a/plugins/CDVDnull/Linux/CDVDnull.cbp +++ b/plugins/CDVDnull/Linux/CDVDnull.cbp @@ -38,6 +38,7 @@ + diff --git a/plugins/FWnull/Linux/FWnull.cbp b/plugins/FWnull/Linux/FWnull.cbp index fac2ccac79..572b5391e7 100644 --- a/plugins/FWnull/Linux/FWnull.cbp +++ b/plugins/FWnull/Linux/FWnull.cbp @@ -34,6 +34,7 @@ + diff --git a/plugins/GSnull/GifTransfer.cpp b/plugins/GSnull/GifTransfer.cpp index 3c940c93df..814516e687 100644 --- a/plugins/GSnull/GifTransfer.cpp +++ b/plugins/GSnull/GifTransfer.cpp @@ -33,22 +33,16 @@ template void _GSgifTransfer(const u32 *pMem, u32 size) // FUNCLOG pathInfo *path = &gs.path[index]; - -#ifdef _DEBUG - // [TODO] : Implement looging facilities? - //gifTransferLog(index, pMem, size); -#endif + 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) { path->setTag(pMem); pMem += 4; 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 // values other than the EOP field are disregarded." if (path->nloop > 0) @@ -58,7 +52,7 @@ template void _GSgifTransfer(const u32 *pMem, u32 size) if (path->tag.PRE && (path->tag.FLG == GIF_FLG_PACKED)) { u32 tagprim = path->tag.PRIM; - //GIFRegHandlerPRIM((u32*)&tagprim); + GIFRegHandlerPRIM((u32*)&tagprim); } } } @@ -68,8 +62,6 @@ template void _GSgifTransfer(const u32 *pMem, u32 size) { case GIF_FLG_PACKED: { - // Needs to be looked at. - // first try a shortcut for a very common case if (path->adonly && size >= path->nloop) @@ -78,7 +70,7 @@ template void _GSgifTransfer(const u32 *pMem, u32 size) do { - //GIFPackedRegHandlerA_D(pMem); + GIFPackedRegHandlerA_D(pMem); pMem += 4; //sizeof(GIFPackedReg)/4; } @@ -89,7 +81,7 @@ template void _GSgifTransfer(const u32 *pMem, u32 size) do { u32 reg = path->GetReg(); - //g_GIFPackedRegHandlers[reg](pMem); + GIFPackedRegHandlers[reg](pMem); pMem += 4; //sizeof(GIFPackedReg)/4; size--; @@ -101,14 +93,13 @@ template void _GSgifTransfer(const u32 *pMem, u32 size) case GIF_FLG_REGLIST: { - // Needs to be looked at. - //ZZLog::GS_Log("%8.8x%8.8x %d L", ((u32*)&gs.regs)[1], *(u32*)&gs.regs, path->tag.nreg/4); + //GS_Log("%8.8x%8.8x %d L", ((u32*)&gs.regs)[1], *(u32*)&gs.regs, path->tag.nreg/4); size *= 2; do { - //g_GIFRegHandlers[path->GetReg()](pMem); + GIFRegHandlers[path->GetReg()](pMem); pMem += 2; size--; @@ -167,40 +158,15 @@ template void _GSgifTransfer(const u32 *pMem, u32 size) 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 -EXPORT_C_(void) GSgifTransfer1(u32 *pMem, u32 addr) +EXPORT_C_(void) GSgifTransfer(const u32 *pMem, u32 size) { #ifdef DO_GIF_TRANSFERS - _GSgifTransfer<0>((u32*)((u8*)pMem + addr), (0x4000 - addr) / 16); + _GSgifTransfer<3>(const_cast(pMem), size); #endif } @@ -218,13 +184,6 @@ EXPORT_C_(void) GSgifTransfer3(u32 *pMem, u32 size) #endif } -EXPORT_C_(void) GSgifTransfer(const u32 *pMem, u32 size) -{ -#ifdef DO_GIF_TRANSFERS - _GSgifTransfer<3>(const_cast(pMem), size); -#endif -} - void InitPath() { gs.path[0].mode = gs.path[1].mode = gs.path[2].mode = gs.path[3].mode = 0; diff --git a/plugins/GSnull/GifTransfer.h b/plugins/GSnull/GifTransfer.h index 9fbaff5e52..734778f180 100644 --- a/plugins/GSnull/GifTransfer.h +++ b/plugins/GSnull/GifTransfer.h @@ -124,7 +124,6 @@ extern void _GSgifPacket(pathInfo *path, const u32 *pMem); extern void _GSgifRegList(pathInfo *path, const u32 *pMem); template extern void _GSgifTransfer(const u32 *pMem, u32 size); -extern GIFRegHandler g_GIFPackedRegHandlers[]; -extern GIFRegHandler g_GIFRegHandlers[]; -/*extern void InitPath();*/ +extern GIFRegHandler GIFPackedRegHandlers[]; +extern GIFRegHandler GIFRegHandlers[]; #endif // GIFTRANSFER_H_INCLUDED diff --git a/plugins/GSnull/Registers.cpp b/plugins/GSnull/Registers.cpp index e9df5d80d5..dbc892ef23 100644 --- a/plugins/GSnull/Registers.cpp +++ b/plugins/GSnull/Registers.cpp @@ -19,8 +19,8 @@ #include "GS.h" #include "Registers.h" -GIFRegHandler g_GIFPackedRegHandlers[16]; -GIFRegHandler g_GIFRegHandlers[256]; +GIFRegHandler GIFPackedRegHandlers[16]; +GIFRegHandler GIFRegHandlers[256]; // For now, I'm just rigging this up to store all the register information coming in, without doing // any of the normal processing. @@ -107,7 +107,7 @@ void __gifCall GIFPackedRegHandlerA_D(const u32* data) { GIFPackedA_D* r = (GIFPackedA_D*)(data); - g_GIFRegHandlers[r->ADDR](data); + GIFRegHandlers[r->ADDR](data); } void __gifCall GIFPackedRegHandlerNOP(const u32* data) @@ -396,15 +396,15 @@ void SetMultithreaded() if (gs.MultiThreaded) { - g_GIFRegHandlers[GIF_A_D_REG_SIGNAL] = &GIFRegHandlerNull; - g_GIFRegHandlers[GIF_A_D_REG_FINISH] = &GIFRegHandlerNull; - g_GIFRegHandlers[GIF_A_D_REG_LABEL] = &GIFRegHandlerNull; + GIFRegHandlers[GIF_A_D_REG_SIGNAL] = &GIFRegHandlerNull; + GIFRegHandlers[GIF_A_D_REG_FINISH] = &GIFRegHandlerNull; + GIFRegHandlers[GIF_A_D_REG_LABEL] = &GIFRegHandlerNull; } else { - g_GIFRegHandlers[GIF_A_D_REG_SIGNAL] = &GIFRegHandlerSIGNAL; - g_GIFRegHandlers[GIF_A_D_REG_FINISH] = &GIFRegHandlerFINISH; - g_GIFRegHandlers[GIF_A_D_REG_LABEL] = &GIFRegHandlerLABEL; + GIFRegHandlers[GIF_A_D_REG_SIGNAL] = &GIFRegHandlerSIGNAL; + GIFRegHandlers[GIF_A_D_REG_FINISH] = &GIFRegHandlerFINISH; + GIFRegHandlers[GIF_A_D_REG_LABEL] = &GIFRegHandlerLABEL; } } @@ -412,82 +412,82 @@ void ResetRegs() { for (int i = 0; i < 16; i++) { - g_GIFPackedRegHandlers[i] = &GIFPackedRegHandlerNull; + GIFPackedRegHandlers[i] = &GIFPackedRegHandlerNull; } - g_GIFPackedRegHandlers[GIF_REG_PRIM] = &GIFPackedRegHandlerPRIM; - g_GIFPackedRegHandlers[GIF_REG_RGBA] = &GIFPackedRegHandlerRGBA; - g_GIFPackedRegHandlers[GIF_REG_STQ] = &GIFPackedRegHandlerSTQ; - g_GIFPackedRegHandlers[GIF_REG_UV] = &GIFPackedRegHandlerUV; - g_GIFPackedRegHandlers[GIF_REG_XYZF2] = &GIFPackedRegHandlerXYZF2; - g_GIFPackedRegHandlers[GIF_REG_XYZ2] = &GIFPackedRegHandlerXYZ2; - g_GIFPackedRegHandlers[GIF_REG_TEX0_1] = &GIFPackedRegHandlerTEX0<0>; - g_GIFPackedRegHandlers[GIF_REG_TEX0_2] = &GIFPackedRegHandlerTEX0<1>; - g_GIFPackedRegHandlers[GIF_REG_CLAMP_1] = &GIFPackedRegHandlerCLAMP<0>; - g_GIFPackedRegHandlers[GIF_REG_CLAMP_2] = &GIFPackedRegHandlerCLAMP<1>; - g_GIFPackedRegHandlers[GIF_REG_FOG] = &GIFPackedRegHandlerFOG; - g_GIFPackedRegHandlers[GIF_REG_XYZF3] = &GIFPackedRegHandlerXYZF3; - g_GIFPackedRegHandlers[GIF_REG_XYZ3] = &GIFPackedRegHandlerXYZ3; - g_GIFPackedRegHandlers[GIF_REG_A_D] = &GIFPackedRegHandlerA_D; - g_GIFPackedRegHandlers[GIF_REG_NOP] = &GIFPackedRegHandlerNOP; + GIFPackedRegHandlers[GIF_REG_PRIM] = &GIFPackedRegHandlerPRIM; + GIFPackedRegHandlers[GIF_REG_RGBA] = &GIFPackedRegHandlerRGBA; + GIFPackedRegHandlers[GIF_REG_STQ] = &GIFPackedRegHandlerSTQ; + GIFPackedRegHandlers[GIF_REG_UV] = &GIFPackedRegHandlerUV; + GIFPackedRegHandlers[GIF_REG_XYZF2] = &GIFPackedRegHandlerXYZF2; + GIFPackedRegHandlers[GIF_REG_XYZ2] = &GIFPackedRegHandlerXYZ2; + GIFPackedRegHandlers[GIF_REG_TEX0_1] = &GIFPackedRegHandlerTEX0<0>; + GIFPackedRegHandlers[GIF_REG_TEX0_2] = &GIFPackedRegHandlerTEX0<1>; + GIFPackedRegHandlers[GIF_REG_CLAMP_1] = &GIFPackedRegHandlerCLAMP<0>; + GIFPackedRegHandlers[GIF_REG_CLAMP_2] = &GIFPackedRegHandlerCLAMP<1>; + GIFPackedRegHandlers[GIF_REG_FOG] = &GIFPackedRegHandlerFOG; + GIFPackedRegHandlers[GIF_REG_XYZF3] = &GIFPackedRegHandlerXYZF3; + GIFPackedRegHandlers[GIF_REG_XYZ3] = &GIFPackedRegHandlerXYZ3; + GIFPackedRegHandlers[GIF_REG_A_D] = &GIFPackedRegHandlerA_D; + GIFPackedRegHandlers[GIF_REG_NOP] = &GIFPackedRegHandlerNOP; for (int i = 0; i < 256; i++) { - g_GIFRegHandlers[i] = &GIFPackedRegHandlerNull; + GIFRegHandlers[i] = &GIFRegHandlerNull; } - g_GIFRegHandlers[GIF_A_D_REG_PRIM] = &GIFRegHandlerPRIM; - g_GIFRegHandlers[GIF_A_D_REG_RGBAQ] = &GIFRegHandlerRGBAQ; - g_GIFRegHandlers[GIF_A_D_REG_ST] = &GIFRegHandlerST; - g_GIFRegHandlers[GIF_A_D_REG_UV] = &GIFRegHandlerUV; - g_GIFRegHandlers[GIF_A_D_REG_XYZF2] = &GIFRegHandlerXYZF2; - g_GIFRegHandlers[GIF_A_D_REG_XYZ2] = &GIFRegHandlerXYZ2; - g_GIFRegHandlers[GIF_A_D_REG_TEX0_1] = &GIFRegHandlerTEX0<0>; - g_GIFRegHandlers[GIF_A_D_REG_TEX0_2] = &GIFRegHandlerTEX0<1>; - g_GIFRegHandlers[GIF_A_D_REG_CLAMP_1] = &GIFRegHandlerCLAMP<0>; - g_GIFRegHandlers[GIF_A_D_REG_CLAMP_2] = &GIFRegHandlerCLAMP<1>; - g_GIFRegHandlers[GIF_A_D_REG_FOG] = &GIFRegHandlerFOG; - g_GIFRegHandlers[GIF_A_D_REG_XYZF3] = &GIFRegHandlerXYZF3; - g_GIFRegHandlers[GIF_A_D_REG_XYZ3] = &GIFRegHandlerXYZ3; - g_GIFRegHandlers[GIF_A_D_REG_NOP] = &GIFRegHandlerNOP; - g_GIFRegHandlers[GIF_A_D_REG_TEX1_1] = &GIFRegHandlerTEX1<0>; - g_GIFRegHandlers[GIF_A_D_REG_TEX1_2] = &GIFRegHandlerTEX1<1>; - g_GIFRegHandlers[GIF_A_D_REG_TEX2_1] = &GIFRegHandlerTEX2<0>; - g_GIFRegHandlers[GIF_A_D_REG_TEX2_2] = &GIFRegHandlerTEX2<1>; - g_GIFRegHandlers[GIF_A_D_REG_XYOFFSET_1] = &GIFRegHandlerXYOFFSET<0>; - g_GIFRegHandlers[GIF_A_D_REG_XYOFFSET_2] = &GIFRegHandlerXYOFFSET<1>; - g_GIFRegHandlers[GIF_A_D_REG_PRMODECONT] = &GIFRegHandlerPRMODECONT; - g_GIFRegHandlers[GIF_A_D_REG_PRMODE] = &GIFRegHandlerPRMODE; - g_GIFRegHandlers[GIF_A_D_REG_TEXCLUT] = &GIFRegHandlerTEXCLUT; - g_GIFRegHandlers[GIF_A_D_REG_SCANMSK] = &GIFRegHandlerSCANMSK; - g_GIFRegHandlers[GIF_A_D_REG_MIPTBP1_1] = &GIFRegHandlerMIPTBP1<0>; - g_GIFRegHandlers[GIF_A_D_REG_MIPTBP1_2] = &GIFRegHandlerMIPTBP1<1>; - g_GIFRegHandlers[GIF_A_D_REG_MIPTBP2_1] = &GIFRegHandlerMIPTBP2<0>; - g_GIFRegHandlers[GIF_A_D_REG_MIPTBP2_2] = &GIFRegHandlerMIPTBP2<1>; - g_GIFRegHandlers[GIF_A_D_REG_TEXA] = &GIFRegHandlerTEXA; - g_GIFRegHandlers[GIF_A_D_REG_FOGCOL] = &GIFRegHandlerFOGCOL; - g_GIFRegHandlers[GIF_A_D_REG_TEXFLUSH] = &GIFRegHandlerTEXFLUSH; - g_GIFRegHandlers[GIF_A_D_REG_SCISSOR_1] = &GIFRegHandlerSCISSOR<0>; - g_GIFRegHandlers[GIF_A_D_REG_SCISSOR_2] = &GIFRegHandlerSCISSOR<1>; - g_GIFRegHandlers[GIF_A_D_REG_ALPHA_1] = &GIFRegHandlerALPHA<0>; - g_GIFRegHandlers[GIF_A_D_REG_ALPHA_2] = &GIFRegHandlerALPHA<1>; - g_GIFRegHandlers[GIF_A_D_REG_DIMX] = &GIFRegHandlerDIMX; - g_GIFRegHandlers[GIF_A_D_REG_DTHE] = &GIFRegHandlerDTHE; - g_GIFRegHandlers[GIF_A_D_REG_COLCLAMP] = &GIFRegHandlerCOLCLAMP; - g_GIFRegHandlers[GIF_A_D_REG_TEST_1] = &GIFRegHandlerTEST<0>; - g_GIFRegHandlers[GIF_A_D_REG_TEST_2] = &GIFRegHandlerTEST<1>; - g_GIFRegHandlers[GIF_A_D_REG_PABE] = &GIFRegHandlerPABE; - g_GIFRegHandlers[GIF_A_D_REG_FBA_1] = &GIFRegHandlerFBA<0>; - g_GIFRegHandlers[GIF_A_D_REG_FBA_2] = &GIFRegHandlerFBA<1>; - g_GIFRegHandlers[GIF_A_D_REG_FRAME_1] = &GIFRegHandlerFRAME<0>; - g_GIFRegHandlers[GIF_A_D_REG_FRAME_2] = &GIFRegHandlerFRAME<1>; - g_GIFRegHandlers[GIF_A_D_REG_ZBUF_1] = &GIFRegHandlerZBUF<0>; - g_GIFRegHandlers[GIF_A_D_REG_ZBUF_2] = &GIFRegHandlerZBUF<1>; - g_GIFRegHandlers[GIF_A_D_REG_BITBLTBUF] = &GIFRegHandlerBITBLTBUF; - g_GIFRegHandlers[GIF_A_D_REG_TRXPOS] = &GIFRegHandlerTRXPOS; - g_GIFRegHandlers[GIF_A_D_REG_TRXREG] = &GIFRegHandlerTRXREG; - g_GIFRegHandlers[GIF_A_D_REG_TRXDIR] = &GIFRegHandlerTRXDIR; - g_GIFRegHandlers[GIF_A_D_REG_HWREG] = &GIFRegHandlerHWREG; + GIFRegHandlers[GIF_A_D_REG_PRIM] = &GIFRegHandlerPRIM; + GIFRegHandlers[GIF_A_D_REG_RGBAQ] = &GIFRegHandlerRGBAQ; + GIFRegHandlers[GIF_A_D_REG_ST] = &GIFRegHandlerST; + GIFRegHandlers[GIF_A_D_REG_UV] = &GIFRegHandlerUV; + GIFRegHandlers[GIF_A_D_REG_XYZF2] = &GIFRegHandlerXYZF2; + GIFRegHandlers[GIF_A_D_REG_XYZ2] = &GIFRegHandlerXYZ2; + GIFRegHandlers[GIF_A_D_REG_TEX0_1] = &GIFRegHandlerTEX0<0>; + GIFRegHandlers[GIF_A_D_REG_TEX0_2] = &GIFRegHandlerTEX0<1>; + GIFRegHandlers[GIF_A_D_REG_CLAMP_1] = &GIFRegHandlerCLAMP<0>; + GIFRegHandlers[GIF_A_D_REG_CLAMP_2] = &GIFRegHandlerCLAMP<1>; + GIFRegHandlers[GIF_A_D_REG_FOG] = &GIFRegHandlerFOG; + GIFRegHandlers[GIF_A_D_REG_XYZF3] = &GIFRegHandlerXYZF3; + GIFRegHandlers[GIF_A_D_REG_XYZ3] = &GIFRegHandlerXYZ3; + GIFRegHandlers[GIF_A_D_REG_NOP] = &GIFRegHandlerNOP; + GIFRegHandlers[GIF_A_D_REG_TEX1_1] = &GIFRegHandlerTEX1<0>; + GIFRegHandlers[GIF_A_D_REG_TEX1_2] = &GIFRegHandlerTEX1<1>; + GIFRegHandlers[GIF_A_D_REG_TEX2_1] = &GIFRegHandlerTEX2<0>; + GIFRegHandlers[GIF_A_D_REG_TEX2_2] = &GIFRegHandlerTEX2<1>; + GIFRegHandlers[GIF_A_D_REG_XYOFFSET_1] = &GIFRegHandlerXYOFFSET<0>; + GIFRegHandlers[GIF_A_D_REG_XYOFFSET_2] = &GIFRegHandlerXYOFFSET<1>; + GIFRegHandlers[GIF_A_D_REG_PRMODECONT] = &GIFRegHandlerPRMODECONT; + GIFRegHandlers[GIF_A_D_REG_PRMODE] = &GIFRegHandlerPRMODE; + GIFRegHandlers[GIF_A_D_REG_TEXCLUT] = &GIFRegHandlerTEXCLUT; + GIFRegHandlers[GIF_A_D_REG_SCANMSK] = &GIFRegHandlerSCANMSK; + GIFRegHandlers[GIF_A_D_REG_MIPTBP1_1] = &GIFRegHandlerMIPTBP1<0>; + GIFRegHandlers[GIF_A_D_REG_MIPTBP1_2] = &GIFRegHandlerMIPTBP1<1>; + GIFRegHandlers[GIF_A_D_REG_MIPTBP2_1] = &GIFRegHandlerMIPTBP2<0>; + GIFRegHandlers[GIF_A_D_REG_MIPTBP2_2] = &GIFRegHandlerMIPTBP2<1>; + GIFRegHandlers[GIF_A_D_REG_TEXA] = &GIFRegHandlerTEXA; + GIFRegHandlers[GIF_A_D_REG_FOGCOL] = &GIFRegHandlerFOGCOL; + GIFRegHandlers[GIF_A_D_REG_TEXFLUSH] = &GIFRegHandlerTEXFLUSH; + GIFRegHandlers[GIF_A_D_REG_SCISSOR_1] = &GIFRegHandlerSCISSOR<0>; + GIFRegHandlers[GIF_A_D_REG_SCISSOR_2] = &GIFRegHandlerSCISSOR<1>; + GIFRegHandlers[GIF_A_D_REG_ALPHA_1] = &GIFRegHandlerALPHA<0>; + GIFRegHandlers[GIF_A_D_REG_ALPHA_2] = &GIFRegHandlerALPHA<1>; + GIFRegHandlers[GIF_A_D_REG_DIMX] = &GIFRegHandlerDIMX; + GIFRegHandlers[GIF_A_D_REG_DTHE] = &GIFRegHandlerDTHE; + GIFRegHandlers[GIF_A_D_REG_COLCLAMP] = &GIFRegHandlerCOLCLAMP; + GIFRegHandlers[GIF_A_D_REG_TEST_1] = &GIFRegHandlerTEST<0>; + GIFRegHandlers[GIF_A_D_REG_TEST_2] = &GIFRegHandlerTEST<1>; + GIFRegHandlers[GIF_A_D_REG_PABE] = &GIFRegHandlerPABE; + GIFRegHandlers[GIF_A_D_REG_FBA_1] = &GIFRegHandlerFBA<0>; + GIFRegHandlers[GIF_A_D_REG_FBA_2] = &GIFRegHandlerFBA<1>; + GIFRegHandlers[GIF_A_D_REG_FRAME_1] = &GIFRegHandlerFRAME<0>; + GIFRegHandlers[GIF_A_D_REG_FRAME_2] = &GIFRegHandlerFRAME<1>; + GIFRegHandlers[GIF_A_D_REG_ZBUF_1] = &GIFRegHandlerZBUF<0>; + GIFRegHandlers[GIF_A_D_REG_ZBUF_2] = &GIFRegHandlerZBUF<1>; + GIFRegHandlers[GIF_A_D_REG_BITBLTBUF] = &GIFRegHandlerBITBLTBUF; + GIFRegHandlers[GIF_A_D_REG_TRXPOS] = &GIFRegHandlerTRXPOS; + GIFRegHandlers[GIF_A_D_REG_TRXREG] = &GIFRegHandlerTRXREG; + GIFRegHandlers[GIF_A_D_REG_TRXDIR] = &GIFRegHandlerTRXDIR; + GIFRegHandlers[GIF_A_D_REG_HWREG] = &GIFRegHandlerHWREG; SetMultithreaded(); } @@ -495,52 +495,52 @@ void SetFrameSkip(bool skip) { if (skip) { - g_GIFPackedRegHandlers[GIF_REG_PRIM] = &GIFPackedRegHandlerNOP; - g_GIFPackedRegHandlers[GIF_REG_RGBA] = &GIFPackedRegHandlerNOP; - g_GIFPackedRegHandlers[GIF_REG_STQ] = &GIFPackedRegHandlerNOP; - g_GIFPackedRegHandlers[GIF_REG_UV] = &GIFPackedRegHandlerNOP; - g_GIFPackedRegHandlers[GIF_REG_XYZF2] = &GIFPackedRegHandlerNOP; - g_GIFPackedRegHandlers[GIF_REG_XYZ2] = &GIFPackedRegHandlerNOP; - g_GIFPackedRegHandlers[GIF_REG_CLAMP_1] = &GIFPackedRegHandlerNOP; - g_GIFPackedRegHandlers[GIF_REG_CLAMP_2] = &GIFPackedRegHandlerNOP; - g_GIFPackedRegHandlers[GIF_REG_FOG] = &GIFPackedRegHandlerNOP; - g_GIFPackedRegHandlers[GIF_REG_XYZF3] = &GIFPackedRegHandlerNOP; - g_GIFPackedRegHandlers[GIF_REG_XYZ3] = &GIFPackedRegHandlerNOP; + GIFPackedRegHandlers[GIF_REG_PRIM] = &GIFPackedRegHandlerNOP; + GIFPackedRegHandlers[GIF_REG_RGBA] = &GIFPackedRegHandlerNOP; + GIFPackedRegHandlers[GIF_REG_STQ] = &GIFPackedRegHandlerNOP; + GIFPackedRegHandlers[GIF_REG_UV] = &GIFPackedRegHandlerNOP; + GIFPackedRegHandlers[GIF_REG_XYZF2] = &GIFPackedRegHandlerNOP; + GIFPackedRegHandlers[GIF_REG_XYZ2] = &GIFPackedRegHandlerNOP; + GIFPackedRegHandlers[GIF_REG_CLAMP_1] = &GIFPackedRegHandlerNOP; + GIFPackedRegHandlers[GIF_REG_CLAMP_2] = &GIFPackedRegHandlerNOP; + GIFPackedRegHandlers[GIF_REG_FOG] = &GIFPackedRegHandlerNOP; + GIFPackedRegHandlers[GIF_REG_XYZF3] = &GIFPackedRegHandlerNOP; + GIFPackedRegHandlers[GIF_REG_XYZ3] = &GIFPackedRegHandlerNOP; - g_GIFRegHandlers[GIF_A_D_REG_PRIM] = &GIFRegHandlerNOP; - g_GIFRegHandlers[GIF_A_D_REG_RGBAQ] = &GIFRegHandlerNOP; - g_GIFRegHandlers[GIF_A_D_REG_ST] = &GIFRegHandlerNOP; - g_GIFRegHandlers[GIF_A_D_REG_UV] = &GIFRegHandlerNOP; - g_GIFRegHandlers[GIF_A_D_REG_XYZF2] = &GIFRegHandlerNOP; - g_GIFRegHandlers[GIF_A_D_REG_XYZ2] = &GIFRegHandlerNOP; - g_GIFRegHandlers[GIF_A_D_REG_XYZF3] = &GIFRegHandlerNOP; - g_GIFRegHandlers[GIF_A_D_REG_XYZ3] = &GIFRegHandlerNOP; - g_GIFRegHandlers[GIF_A_D_REG_PRMODECONT] = &GIFRegHandlerNOP; - g_GIFRegHandlers[GIF_A_D_REG_PRMODE] = &GIFRegHandlerNOP; + GIFRegHandlers[GIF_A_D_REG_PRIM] = &GIFRegHandlerNOP; + GIFRegHandlers[GIF_A_D_REG_RGBAQ] = &GIFRegHandlerNOP; + GIFRegHandlers[GIF_A_D_REG_ST] = &GIFRegHandlerNOP; + GIFRegHandlers[GIF_A_D_REG_UV] = &GIFRegHandlerNOP; + GIFRegHandlers[GIF_A_D_REG_XYZF2] = &GIFRegHandlerNOP; + GIFRegHandlers[GIF_A_D_REG_XYZ2] = &GIFRegHandlerNOP; + GIFRegHandlers[GIF_A_D_REG_XYZF3] = &GIFRegHandlerNOP; + GIFRegHandlers[GIF_A_D_REG_XYZ3] = &GIFRegHandlerNOP; + GIFRegHandlers[GIF_A_D_REG_PRMODECONT] = &GIFRegHandlerNOP; + GIFRegHandlers[GIF_A_D_REG_PRMODE] = &GIFRegHandlerNOP; } else { - g_GIFPackedRegHandlers[GIF_REG_PRIM] = &GIFPackedRegHandlerPRIM; - g_GIFPackedRegHandlers[GIF_REG_RGBA] = &GIFPackedRegHandlerRGBA; - g_GIFPackedRegHandlers[GIF_REG_STQ] = &GIFPackedRegHandlerSTQ; - g_GIFPackedRegHandlers[GIF_REG_UV] = &GIFPackedRegHandlerUV; - g_GIFPackedRegHandlers[GIF_REG_XYZF2] = &GIFPackedRegHandlerXYZF2; - g_GIFPackedRegHandlers[GIF_REG_XYZ2] = &GIFPackedRegHandlerXYZ2; - g_GIFPackedRegHandlers[GIF_REG_CLAMP_1] = &GIFPackedRegHandlerCLAMP<0>; - g_GIFPackedRegHandlers[GIF_REG_CLAMP_2] = &GIFPackedRegHandlerCLAMP<1>; - g_GIFPackedRegHandlers[GIF_REG_FOG] = &GIFPackedRegHandlerFOG; - g_GIFPackedRegHandlers[GIF_REG_XYZF3] = &GIFPackedRegHandlerXYZF3; - g_GIFPackedRegHandlers[GIF_REG_XYZ3] = &GIFPackedRegHandlerXYZ3; + GIFPackedRegHandlers[GIF_REG_PRIM] = &GIFPackedRegHandlerPRIM; + GIFPackedRegHandlers[GIF_REG_RGBA] = &GIFPackedRegHandlerRGBA; + GIFPackedRegHandlers[GIF_REG_STQ] = &GIFPackedRegHandlerSTQ; + GIFPackedRegHandlers[GIF_REG_UV] = &GIFPackedRegHandlerUV; + GIFPackedRegHandlers[GIF_REG_XYZF2] = &GIFPackedRegHandlerXYZF2; + GIFPackedRegHandlers[GIF_REG_XYZ2] = &GIFPackedRegHandlerXYZ2; + GIFPackedRegHandlers[GIF_REG_CLAMP_1] = &GIFPackedRegHandlerCLAMP<0>; + GIFPackedRegHandlers[GIF_REG_CLAMP_2] = &GIFPackedRegHandlerCLAMP<1>; + GIFPackedRegHandlers[GIF_REG_FOG] = &GIFPackedRegHandlerFOG; + GIFPackedRegHandlers[GIF_REG_XYZF3] = &GIFPackedRegHandlerXYZF3; + GIFPackedRegHandlers[GIF_REG_XYZ3] = &GIFPackedRegHandlerXYZ3; - g_GIFRegHandlers[GIF_A_D_REG_PRIM] = &GIFRegHandlerPRIM; - g_GIFRegHandlers[GIF_A_D_REG_RGBAQ] = &GIFRegHandlerRGBAQ; - g_GIFRegHandlers[GIF_A_D_REG_ST] = &GIFRegHandlerST; - g_GIFRegHandlers[GIF_A_D_REG_UV] = &GIFRegHandlerUV; - g_GIFRegHandlers[GIF_A_D_REG_XYZF2] = &GIFRegHandlerXYZF2; - g_GIFRegHandlers[GIF_A_D_REG_XYZ2] = &GIFRegHandlerXYZ2; - g_GIFRegHandlers[GIF_A_D_REG_XYZF3] = &GIFRegHandlerXYZF3; - g_GIFRegHandlers[GIF_A_D_REG_XYZ3] = &GIFRegHandlerXYZ3; - g_GIFRegHandlers[GIF_A_D_REG_PRMODECONT] = &GIFRegHandlerPRMODECONT; - g_GIFRegHandlers[GIF_A_D_REG_PRMODE] = &GIFRegHandlerPRMODE; + GIFRegHandlers[GIF_A_D_REG_PRIM] = &GIFRegHandlerPRIM; + GIFRegHandlers[GIF_A_D_REG_RGBAQ] = &GIFRegHandlerRGBAQ; + GIFRegHandlers[GIF_A_D_REG_ST] = &GIFRegHandlerST; + GIFRegHandlers[GIF_A_D_REG_UV] = &GIFRegHandlerUV; + GIFRegHandlers[GIF_A_D_REG_XYZF2] = &GIFRegHandlerXYZF2; + GIFRegHandlers[GIF_A_D_REG_XYZ2] = &GIFRegHandlerXYZ2; + GIFRegHandlers[GIF_A_D_REG_XYZF3] = &GIFRegHandlerXYZF3; + GIFRegHandlers[GIF_A_D_REG_XYZ3] = &GIFRegHandlerXYZ3; + GIFRegHandlers[GIF_A_D_REG_PRMODECONT] = &GIFRegHandlerPRMODECONT; + GIFRegHandlers[GIF_A_D_REG_PRMODE] = &GIFRegHandlerPRMODE; } } diff --git a/plugins/PadNull/Linux/PadNull.cbp b/plugins/PadNull/Linux/PadNull.cbp index 19d7549755..8321b5b7a5 100644 --- a/plugins/PadNull/Linux/PadNull.cbp +++ b/plugins/PadNull/Linux/PadNull.cbp @@ -38,6 +38,7 @@ + diff --git a/plugins/SPU2null/Linux/SPU2null.cbp b/plugins/SPU2null/Linux/SPU2null.cbp index 3896a5205f..9fbea35355 100644 --- a/plugins/SPU2null/Linux/SPU2null.cbp +++ b/plugins/SPU2null/Linux/SPU2null.cbp @@ -44,6 +44,7 @@ + diff --git a/plugins/USBnull/Linux/USBnull.cbp b/plugins/USBnull/Linux/USBnull.cbp index d06fdb2b58..3003e84367 100644 --- a/plugins/USBnull/Linux/USBnull.cbp +++ b/plugins/USBnull/Linux/USBnull.cbp @@ -38,6 +38,7 @@ + diff --git a/plugins/dev9null/Linux/Dev9null.cbp b/plugins/dev9null/Linux/Dev9null.cbp index 73c5f32209..70c16c8c94 100644 --- a/plugins/dev9null/Linux/Dev9null.cbp +++ b/plugins/dev9null/Linux/Dev9null.cbp @@ -38,6 +38,7 @@ + diff --git a/plugins/onepad/Linux/OnePad.cbp b/plugins/onepad/Linux/OnePad.cbp index 069de1c6ef..87f068a49b 100644 --- a/plugins/onepad/Linux/OnePad.cbp +++ b/plugins/onepad/Linux/OnePad.cbp @@ -39,6 +39,7 @@ + diff --git a/plugins/spu2-x/src/Linux/SPU2-X.cbp b/plugins/spu2-x/src/Linux/SPU2-X.cbp index fa27c73506..d55b7a0fc4 100644 --- a/plugins/spu2-x/src/Linux/SPU2-X.cbp +++ b/plugins/spu2-x/src/Linux/SPU2-X.cbp @@ -48,6 +48,7 @@ +