diff --git a/plugins/GSnull/GS.cpp b/plugins/GSnull/GS.cpp index 2054d2ddae..1fd78d5ee8 100644 --- a/plugins/GSnull/GS.cpp +++ b/plugins/GSnull/GS.cpp @@ -28,19 +28,19 @@ using namespace std; #include "GifTransfer.h" #include "null/GSnull.h" #ifdef _MSC_VER -# include "svnrev.h" +#include "svnrev.h" #endif -const unsigned char version = PS2E_GS_VERSION; +const unsigned char version = PS2E_GS_VERSION; const unsigned char revision = 0; -const unsigned char build = 1; // increase that with each version +const unsigned char build = 1; // increase that with each version static char libraryName[256]; Config conf; u32 GSKeyEvent = 0; bool GSShift = false, GSAlt = false; -string s_strIniPath="inis"; +string s_strIniPath = "inis"; extern std::string s_strLogPath; const char* s_iniFilename = "GSnull.ini"; GSVars gs; @@ -56,215 +56,245 @@ extern void SetMultithreaded(); extern void SetFrameSkip(bool skip); extern void InitPath(); -EXPORT_C_(u32) PS2EgetLibType() +EXPORT_C_(u32) +PS2EgetLibType() { - return PS2E_LT_GS; + return PS2E_LT_GS; } -EXPORT_C_(char*) PS2EgetLibName() +EXPORT_C_(char*) +PS2EgetLibName() { #ifdef _MSC_VER - sprintf_s( libraryName, "GSnull Driver %lld%s",SVN_REV, SVN_MODS ? "m" : ""); - return libraryName; + sprintf_s(libraryName, "GSnull Driver %lld%s", SVN_REV, SVN_MODS ? "m" : ""); + return libraryName; #else - return "GSnull Driver"; + return "GSnull Driver"; #endif } -EXPORT_C_(u32) PS2EgetLibVersion2(u32 type) +EXPORT_C_(u32) +PS2EgetLibVersion2(u32 type) { - return (version<<16) | (revision<<8) | build; + return (version << 16) | (revision << 8) | build; } -EXPORT_C_(void) GSprintf(int timeout, char *fmt, ...) +EXPORT_C_(void) +GSprintf(int timeout, char* fmt, ...) { - va_list list; - char msg[512]; + va_list list; + char msg[512]; - va_start(list, fmt); - vsprintf(msg, fmt, list); - va_end(list); + va_start(list, fmt); + vsprintf(msg, fmt, list); + va_end(list); - GSLog::Print("GSprintf:%s", msg); + GSLog::Print("GSprintf:%s", msg); } // basic funcs -EXPORT_C_(void) GSsetSettingsDir(const char* dir) +EXPORT_C_(void) +GSsetSettingsDir(const char* dir) { - s_strIniPath = (dir == NULL) ? "inis" : dir; + s_strIniPath = (dir == NULL) ? "inis" : dir; } -EXPORT_C_(void) GSsetLogDir(const char* dir) +EXPORT_C_(void) +GSsetLogDir(const char* dir) { - // Get the path to the log directory. - s_strLogPath = (dir==NULL) ? "logs" : dir; + // Get the path to the log directory. + s_strLogPath = (dir == NULL) ? "logs" : dir; - // Reload the log file after updated the path - GSLog::Close(); - GSLog::Open(); + // Reload the log file after updated the path + GSLog::Close(); + GSLog::Open(); } -EXPORT_C_(s32) GSinit() +EXPORT_C_(s32) +GSinit() { - LoadConfig(); + LoadConfig(); - GSLog::Open(); + GSLog::Open(); - GSLog::WriteLn("Initializing GSnull."); - return 0; + GSLog::WriteLn("Initializing GSnull."); + return 0; } -EXPORT_C_(void) GSshutdown() +EXPORT_C_(void) +GSshutdown() { - GSLog::WriteLn("Shutting down GSnull."); - GSCloseWindow(); - GSLog::Close(); + GSLog::WriteLn("Shutting down GSnull."); + GSCloseWindow(); + GSLog::Close(); } -EXPORT_C_(s32) GSopen(void *pDsp, const char *Title, int multithread) +EXPORT_C_(s32) +GSopen(void* pDsp, const char* Title, int multithread) { - int err = 0; - GSLog::WriteLn("GS open."); - //assert( GSirq != NULL ); + int err = 0; + GSLog::WriteLn("GS open."); + //assert( GSirq != NULL ); - err = GSOpenWindow(pDsp, Title); - gs.MultiThreaded = multithread; + err = GSOpenWindow(pDsp, Title); + gs.MultiThreaded = multithread; - ResetRegs(); - SetMultithreaded(); - InitPath(); - GSLog::WriteLn("Opening GSnull."); - return err; + ResetRegs(); + SetMultithreaded(); + InitPath(); + GSLog::WriteLn("Opening GSnull."); + return err; } #ifdef USE_GSOPEN2 -EXPORT_C_(s32) GSopen2( void *pDsp, u32 flags ) +EXPORT_C_(s32) +GSopen2(void* pDsp, u32 flags) { - GSLog::WriteLn("GS open2."); + GSLog::WriteLn("GS open2."); GSOpenWindow2(pDsp, flags); - gs.MultiThreaded = true; + gs.MultiThreaded = true; - ResetRegs(); - SetMultithreaded(); - InitPath(); - GSLog::WriteLn("Opening GSnull (2)."); - return 0; + ResetRegs(); + SetMultithreaded(); + InitPath(); + GSLog::WriteLn("Opening GSnull (2)."); + return 0; } #endif -EXPORT_C_(void) GSclose() +EXPORT_C_(void) +GSclose() { - GSLog::WriteLn("Closing GSnull."); + GSLog::WriteLn("Closing GSnull."); - // Better to only close the window on Shutdown. All the other plugins - // pretty much worked that way, and all old PCSX2 versions expect it as well. - //GSCloseWindow(); + // Better to only close the window on Shutdown. All the other plugins + // pretty much worked that way, and all old PCSX2 versions expect it as well. + //GSCloseWindow(); } -EXPORT_C_(void) GSirqCallback(void (*callback)()) +EXPORT_C_(void) +GSirqCallback(void (*callback)()) { - GSirq = callback; + GSirq = callback; } -EXPORT_C_(s32) GSfreeze(int mode, freezeData *data) +EXPORT_C_(s32) +GSfreeze(int mode, freezeData* data) { - return 0; + return 0; } -EXPORT_C_(s32) GStest() +EXPORT_C_(s32) +GStest() { - GSLog::WriteLn("Testing GSnull."); - return 0; + GSLog::WriteLn("Testing GSnull."); + return 0; } -EXPORT_C_(void) GSvsync(int field) +EXPORT_C_(void) +GSvsync(int field) { - GSProcessMessages(); + GSProcessMessages(); } - // returns the last tag processed (64 bits) -EXPORT_C_(void) GSgetLastTag(u64* ptag) +// returns the last tag processed (64 bits) +EXPORT_C_(void) +GSgetLastTag(u64* ptag) { - *(u32*)ptag = gs.nPath3Hack; - gs.nPath3Hack = 0; + *(u32*)ptag = gs.nPath3Hack; + gs.nPath3Hack = 0; } -EXPORT_C_(void) GSgifSoftReset(u32 mask) +EXPORT_C_(void) +GSgifSoftReset(u32 mask) { - GSLog::WriteLn("Doing a soft reset of the GS plugin."); + GSLog::WriteLn("Doing a soft reset of the GS plugin."); } -EXPORT_C_(void) GSreadFIFO(u64 *mem) +EXPORT_C_(void) +GSreadFIFO(u64* mem) { } -EXPORT_C_(void) GSreadFIFO2(u64 *mem, int qwc) +EXPORT_C_(void) +GSreadFIFO2(u64* mem, int qwc) { } // extended funcs // GSkeyEvent gets called when there is a keyEvent from the PAD plugin -EXPORT_C_(void) GSkeyEvent(keyEvent *ev) +EXPORT_C_(void) +GSkeyEvent(keyEvent* ev) { - HandleKeyEvent(ev); + HandleKeyEvent(ev); } -EXPORT_C_(void) GSchangeSaveState(int, const char* filename) +EXPORT_C_(void) +GSchangeSaveState(int, const char* filename) { } -EXPORT_C_(void) GSmakeSnapshot(char *path) +EXPORT_C_(void) +GSmakeSnapshot(char* path) { - GSLog::WriteLn("Taking a snapshot."); + GSLog::WriteLn("Taking a snapshot."); } -EXPORT_C_(void) GSmakeSnapshot2(char *pathname, int* snapdone, int savejpg) +EXPORT_C_(void) +GSmakeSnapshot2(char* pathname, int* snapdone, int savejpg) { - GSLog::WriteLn("Taking a snapshot to %s.", pathname); + GSLog::WriteLn("Taking a snapshot to %s.", pathname); } -EXPORT_C_(void) GSsetBaseMem(void*) +EXPORT_C_(void) +GSsetBaseMem(void*) { } -EXPORT_C_(void) GSsetGameCRC(int crc, int gameoptions) +EXPORT_C_(void) +GSsetGameCRC(int crc, int gameoptions) { - GSLog::WriteLn("Setting the crc to '%x' with 0x%x for options.", crc, gameoptions); + GSLog::WriteLn("Setting the crc to '%x' with 0x%x for options.", crc, gameoptions); } // controls frame skipping in the GS, if this routine isn't present, frame skipping won't be done -EXPORT_C_(void) GSsetFrameSkip(int frameskip) +EXPORT_C_(void) +GSsetFrameSkip(int frameskip) { - SetFrameSkip(frameskip != 0); - GSLog::WriteLn("Frameskip set to %d.", frameskip); + SetFrameSkip(frameskip != 0); + GSLog::WriteLn("Frameskip set to %d.", frameskip); } // if start is 1, starts recording spu2 data, else stops // returns a non zero value if successful // for now, pData is not used -EXPORT_C_(int) GSsetupRecording(int start, void* pData) +EXPORT_C_(int) +GSsetupRecording(int start, void* pData) { - if (start) - GSLog::WriteLn("Pretending to record."); - else - GSLog::WriteLn("Pretending to stop recording."); + if (start) + GSLog::WriteLn("Pretending to record."); + else + GSLog::WriteLn("Pretending to stop recording."); - return 1; + return 1; } -EXPORT_C_(void) GSreset() +EXPORT_C_(void) +GSreset() { - GSLog::WriteLn("Doing a reset of the GS plugin."); + GSLog::WriteLn("Doing a reset of the GS plugin."); } -EXPORT_C_(void) GSwriteCSR(u32 value) +EXPORT_C_(void) +GSwriteCSR(u32 value) { } -EXPORT_C_(void) GSgetDriverInfo(GSdriverInfo *info) +EXPORT_C_(void) +GSgetDriverInfo(GSdriverInfo* info) { } diff --git a/plugins/GSnull/GS.h b/plugins/GSnull/GS.h index 125cc554cd..2b803dc0cd 100644 --- a/plugins/GSnull/GS.h +++ b/plugins/GSnull/GS.h @@ -23,11 +23,11 @@ typedef struct _keyEvent keyEvent; #include "Pcsx2Defs.h" #ifdef _WIN32 -# include "Windows/GSwin.h" +#include "Windows/GSwin.h" #endif #ifdef __linux__ -# include "Linux/GSLinux.h" +#include "Linux/GSLinux.h" #endif #define GSdefs @@ -40,7 +40,7 @@ typedef struct _keyEvent keyEvent; #ifdef _MSC_VER #define EXPORT_C_(type) extern "C" type CALLBACK #else -#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type +#define EXPORT_C_(type) extern "C" __attribute__((stdcall, externally_visible, visibility("default"))) type #endif //#define GS_LOG GSLog::Log @@ -51,22 +51,22 @@ extern const unsigned char build; typedef struct { - int Log; - bool path3; + int Log; + bool path3; } Config; typedef struct { - u32 CSRw; - pathInfo path[4]; - bool Path3transfer; - float q; - u32 imageTransfer; - int MultiThreaded; - int nPath3Hack; - - GIFReg regs; - GIFCTXTReg ctxt_regs[2]; + u32 CSRw; + pathInfo path[4]; + bool Path3transfer; + float q; + u32 imageTransfer; + int MultiThreaded; + int nPath3Hack; + + GIFReg regs; + GIFCTXTReg ctxt_regs[2]; } GSVars; extern GSVars gs; @@ -79,12 +79,12 @@ extern void (*GSirq)(); namespace GSLog { - extern bool Open(); - extern void Close(); - extern void Log(char *fmt, ...); - extern void Message(char *fmt, ...); - extern void Print(const char *fmt, ...); - extern void WriteLn(const char *fmt, ...); +extern bool Open(); +extern void Close(); +extern void Log(char* fmt, ...); +extern void Message(char* fmt, ...); +extern void Print(const char* fmt, ...); +extern void WriteLn(const char* fmt, ...); }; extern void SaveConfig(); diff --git a/plugins/GSnull/GSLog.cpp b/plugins/GSnull/GSLog.cpp index ba9cc9d588..7683865e2c 100644 --- a/plugins/GSnull/GSLog.cpp +++ b/plugins/GSnull/GSLog.cpp @@ -32,88 +32,85 @@ std::string s_strLogPath("logs"); namespace GSLog { - FILE *gsLog; - - bool Open() - { - bool result = true; - - const std::string LogFile(s_strLogPath + "/GSnull.log"); +FILE* gsLog; - gsLog = fopen(LogFile.c_str(), "w"); - - if (gsLog != NULL) - { - setvbuf(gsLog, NULL, _IONBF, 0); - } - else - { - Message("Can't create log file %s.", LogFile.c_str()); - result = false; - } - - WriteLn("GSnull plugin version %d,%d",revision,build); - WriteLn("GS init."); - - return result; - } - - void Close() - { - if (gsLog) - { - fclose(gsLog); - gsLog = NULL; - } - } - - void Log(char *fmt, ...) - { - va_list list; +bool Open() +{ + bool result = true; - if (!conf.Log || gsLog == NULL) return; + const std::string LogFile(s_strLogPath + "/GSnull.log"); - va_start(list, fmt); - vfprintf(gsLog, fmt, list); - va_end(list); - } - - void Message(char *fmt, ...) - { - va_list list; - char msg[512]; + gsLog = fopen(LogFile.c_str(), "w"); - va_start(list, fmt); - vsprintf(msg, fmt, list); - va_end(list); - - SysMessage("%s\n",msg); - } - - void Print(const char *fmt, ...) - { - va_list list; - char msg[512]; + if (gsLog != NULL) { + setvbuf(gsLog, NULL, _IONBF, 0); + } else { + Message("Can't create log file %s.", LogFile.c_str()); + result = false; + } - va_start(list, fmt); - vsprintf(msg, fmt, list); - va_end(list); + WriteLn("GSnull plugin version %d,%d", revision, build); + WriteLn("GS init."); - Log(msg); - fprintf(stderr, "GSnull:%s", msg); - } - - - void WriteLn(const char *fmt, ...) - { - va_list list; - char msg[512]; + return result; +} - va_start(list, fmt); - vsprintf(msg, fmt, list); - va_end(list); +void Close() +{ + if (gsLog) { + fclose(gsLog); + gsLog = NULL; + } +} - Log("%s\n", msg); - fprintf(stderr, "GSnull:%s\n", msg); - } +void Log(char* fmt, ...) +{ + va_list list; + + if (!conf.Log || gsLog == NULL) + return; + + va_start(list, fmt); + vfprintf(gsLog, fmt, list); + va_end(list); +} + +void Message(char* fmt, ...) +{ + va_list list; + char msg[512]; + + va_start(list, fmt); + vsprintf(msg, fmt, list); + va_end(list); + + SysMessage("%s\n", msg); +} + +void Print(const char* fmt, ...) +{ + va_list list; + char msg[512]; + + va_start(list, fmt); + vsprintf(msg, fmt, list); + va_end(list); + + Log(msg); + fprintf(stderr, "GSnull:%s", msg); +} + + +void WriteLn(const char* fmt, ...) +{ + va_list list; + char msg[512]; + + va_start(list, fmt); + vsprintf(msg, fmt, list); + va_end(list); + + Log("%s\n", msg); + fprintf(stderr, "GSnull:%s\n", msg); +} }; diff --git a/plugins/GSnull/GifTransfer.cpp b/plugins/GSnull/GifTransfer.cpp index 45a79d2ec5..150538ff7e 100644 --- a/plugins/GSnull/GifTransfer.cpp +++ b/plugins/GSnull/GifTransfer.cpp @@ -14,7 +14,7 @@ */ - // Processes a GIFtag & packet, and throws out some gsIRQs as needed. +// Processes a GIFtag & packet, and throws out some gsIRQs as needed. // Used to keep interrupts in sync with the EE, while the GS itself // runs potentially several frames behind. // size - size of the packet in simd128's @@ -26,174 +26,162 @@ using namespace std; extern GSVars gs; -PCSX2_ALIGNED16( u8 g_RealGSMem[0x2000] ); +PCSX2_ALIGNED16(u8 g_RealGSMem[0x2000]); -template void _GSgifTransfer(const u32 *pMem, u32 size) +template +void _GSgifTransfer(const u32* pMem, u32 size) { -// FUNCLOG + // FUNCLOG - pathInfo *path = &gs.path[index]; - - while (size > 0) - { - //GSLog::Writeln(_T("Transfer(%08x, %d) START\n"), pMem, size); - if (path->nloop == 0) - { - path->setTag(pMem); - pMem += 4; - size--; + pathInfo* path = &gs.path[index]; - // 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; + while (size > 0) { + //GSLog::Writeln(_T("Transfer(%08x, %d) START\n"), pMem, size); + if (path->nloop == 0) { + path->setTag(pMem); + pMem += 4; + size--; - if (path->tag.PRE && (path->tag.FLG == GIF_FLG_PACKED)) - { - u32 tagprim = path->tag.PRIM; - GIFRegHandlerPRIM((u32*)&tagprim); - } - } - } - else - { - switch (path->mode) - { - case GIF_FLG_PACKED: - { - // first try a shortcut for a very common case + // 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; - if (path->adonly && size >= path->nloop) - { - size -= path->nloop; + if (path->tag.PRE && (path->tag.FLG == GIF_FLG_PACKED)) { + u32 tagprim = path->tag.PRIM; + GIFRegHandlerPRIM((u32*)&tagprim); + } + } + } else { + switch (path->mode) { + case GIF_FLG_PACKED: { + // first try a shortcut for a very common case - do - { - GIFPackedRegHandlerA_D(pMem); + if (path->adonly && size >= path->nloop) { + size -= path->nloop; - pMem += 4; //sizeof(GIFPackedReg)/4; - } - while(--path->nloop > 0); - break; - } + do { + GIFPackedRegHandlerA_D(pMem); - do - { - u32 reg = path->GetReg(); - GIFPackedRegHandlers[reg](pMem); - - pMem += 4; //sizeof(GIFPackedReg)/4; - size--; - } - while (path->StepReg() && (size > 0)); + pMem += 4; //sizeof(GIFPackedReg)/4; + } while (--path->nloop > 0); + break; + } - break; - } + do { + u32 reg = path->GetReg(); + GIFPackedRegHandlers[reg](pMem); - case GIF_FLG_REGLIST: - { - //GSLog::Writeln("%8.8x%8.8x %d L", ((u32*)&gs.regs)[1], *(u32*)&gs.regs, path->tag.nreg/4); + pMem += 4; //sizeof(GIFPackedReg)/4; + size--; + } while (path->StepReg() && (size > 0)); - size *= 2; + break; + } - do - { - GIFRegHandlers[path->GetReg()](pMem); + case GIF_FLG_REGLIST: { + //GSLog::Writeln("%8.8x%8.8x %d L", ((u32*)&gs.regs)[1], *(u32*)&gs.regs, path->tag.nreg/4); - pMem += 2; - size--; - } - while (path->StepReg() && (size > 0)); + size *= 2; - if (size & 1) pMem += 2; - size /= 2; - break; - } + do { + GIFRegHandlers[path->GetReg()](pMem); - case GIF_FLG_IMAGE: // FROM_VFRAM - case GIF_FLG_IMAGE2: // Used in the DirectX version, so we'll use it here too. - { - int len = min(size, path->nloop); - //GSLog::Writeln("GIF_FLG_IMAGE(%d)=%d", gs.imageTransfer, len); + pMem += 2; + size--; + } while (path->StepReg() && (size > 0)); - switch (gs.imageTransfer) - { - case 0: - //TransferHostLocal(pMem, len * 4); - break; + if (size & 1) + pMem += 2; + size /= 2; + break; + } - case 1: - // This can't happen; downloads can not be started or performed as part of - // a GIFtag operation. They're an entirely separate process that can only be - // done through the ReverseFIFO transfer (aka ReadFIFO). --air - assert(0); - break; + case GIF_FLG_IMAGE: // FROM_VFRAM + case GIF_FLG_IMAGE2: // Used in the DirectX version, so we'll use it here too. + { + int len = min(size, path->nloop); + //GSLog::Writeln("GIF_FLG_IMAGE(%d)=%d", gs.imageTransfer, len); - case 2: - // //TransferLocalLocal(); - break; + switch (gs.imageTransfer) { + case 0: + //TransferHostLocal(pMem, len * 4); + break; - case 3: - //assert(0); - break; + case 1: + // This can't happen; downloads can not be started or performed as part of + // a GIFtag operation. They're an entirely separate process that can only be + // done through the ReverseFIFO transfer (aka ReadFIFO). --air + assert(0); + break; - default: - //assert(0); - break; - } + case 2: + // //TransferLocalLocal(); + break; - pMem += len * 4; + case 3: + //assert(0); + break; - path->nloop -= len; - size -= len; + default: + //assert(0); + break; + } - break; - } + pMem += len * 4; - default: // GIF_IMAGE - GSLog::WriteLn("*** WARNING **** Unexpected GIFTag flag."); - assert(0); - path->nloop = 0; - break; - } - } - } + path->nloop -= len; + size -= len; + + break; + } + + default: // GIF_IMAGE + GSLog::WriteLn("*** WARNING **** Unexpected GIFTag flag."); + assert(0); + path->nloop = 0; + break; + } + } + } } #define DO_GIF_TRANSFERS // Obsolete. Included because it's still in GSdef. -EXPORT_C_(void) GSgifTransfer1(u32 *pMem, u32 addr) +EXPORT_C_(void) +GSgifTransfer1(u32* pMem, u32 addr) { #ifdef DO_GIF_TRANSFERS - _GSgifTransfer<0>((u32*)((u8*)pMem + addr), (0x4000 - addr) / 16); + _GSgifTransfer<0>((u32*)((u8*)pMem + addr), (0x4000 - addr) / 16); #endif } -EXPORT_C_(void) GSgifTransfer(const u32 *pMem, u32 size) +EXPORT_C_(void) +GSgifTransfer(const u32* pMem, u32 size) { #ifdef DO_GIF_TRANSFERS - _GSgifTransfer<3>(const_cast(pMem), size); + _GSgifTransfer<3>(const_cast(pMem), size); #endif } -EXPORT_C_(void) GSgifTransfer2(u32 *pMem, u32 size) +EXPORT_C_(void) +GSgifTransfer2(u32* pMem, u32 size) { #ifdef DO_GIF_TRANSFERS - _GSgifTransfer<1>(const_cast(pMem), size); + _GSgifTransfer<1>(const_cast(pMem), size); #endif } -EXPORT_C_(void) GSgifTransfer3(u32 *pMem, u32 size) +EXPORT_C_(void) +GSgifTransfer3(u32* pMem, u32 size) { #ifdef DO_GIF_TRANSFERS - _GSgifTransfer<2>(const_cast(pMem), size); + _GSgifTransfer<2>(const_cast(pMem), size); #endif } 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; } - diff --git a/plugins/GSnull/GifTransfer.h b/plugins/GSnull/GifTransfer.h index 583efc78d7..f1535b3245 100644 --- a/plugins/GSnull/GifTransfer.h +++ b/plugins/GSnull/GifTransfer.h @@ -20,110 +20,113 @@ #include #include "Registers.h" -enum GIF_FLG -{ - GIF_FLG_PACKED = 0, - GIF_FLG_REGLIST = 1, - GIF_FLG_IMAGE = 2, - GIF_FLG_IMAGE2 = 3 +enum GIF_FLG { + GIF_FLG_PACKED = 0, + GIF_FLG_REGLIST = 1, + GIF_FLG_IMAGE = 2, + GIF_FLG_IMAGE2 = 3 }; // // GIFTag union GIFTag { - u64 ai64[2]; - u32 ai32[4]; + u64 ai64[2]; + u32 ai32[4]; - struct - { - u32 NLOOP : 15; - u32 EOP : 1; - u32 _PAD1 : 16; - u32 _PAD2 : 14; - u32 PRE : 1; - u32 PRIM : 11; - u32 FLG : 2; // enum GIF_FLG - u32 NREG : 4; - u64 REGS : 64; - }; + struct + { + u32 NLOOP : 15; + u32 EOP : 1; + u32 _PAD1 : 16; + u32 _PAD2 : 14; + u32 PRE : 1; + u32 PRIM : 11; + u32 FLG : 2; // enum GIF_FLG + u32 NREG : 4; + u64 REGS : 64; + }; - void set(const u32 *data) - { - for (int i = 0; i <= 3; i++) - { - ai32[i] = data[i]; - } - } + void set(const u32* data) + { + for (int i = 0; i <= 3; i++) { + ai32[i] = data[i]; + } + } - GIFTag(u32 *data) - { - set(data); - } + GIFTag(u32* data) + { + set(data); + } - GIFTag(){ ai64[0] = 0; ai64[1] = 0; } + GIFTag() + { + ai64[0] = 0; + ai64[1] = 0; + } }; // EE part. Data transfer packet description typedef struct { - u32 mode; - int reg; - u64 regs; - u32 nloop; - int eop; - int nreg; - u32 adonly; - GIFTag tag; + u32 mode; + int reg; + u64 regs; + u32 nloop; + int eop; + int nreg; + u32 adonly; + GIFTag tag; - void setTag(const u32 *data) - { - tag.set(data); + void setTag(const u32* data) + { + tag.set(data); - nloop = tag.NLOOP; - eop = tag.EOP; - mode = tag.FLG; - //adonly = false; + nloop = tag.NLOOP; + eop = tag.EOP; + mode = tag.FLG; + //adonly = false; - // Hmm.... - nreg = tag.NREG << 2; - if (nreg == 0) nreg = 64; - regs = tag.REGS; - reg = 0; - //if ((nreg == 4) && (regs == GIF_REG_A_D)) adonly = true; + // Hmm.... + nreg = tag.NREG << 2; + if (nreg == 0) + nreg = 64; + regs = tag.REGS; + reg = 0; + //if ((nreg == 4) && (regs == GIF_REG_A_D)) adonly = true; - // GSLog::Writeln"GIFtag: %8.8lx_%8.8lx_%8.8lx_%8.8lx: EOP=%d, NLOOP=%x, FLG=%x, NREG=%d, PRE=%d", - // data[3], data[2], data[1], data[0], - // path->eop, path->nloop, mode, path->nreg, tag.PRE); - } + // GSLog::Writeln"GIFtag: %8.8lx_%8.8lx_%8.8lx_%8.8lx: EOP=%d, NLOOP=%x, FLG=%x, NREG=%d, PRE=%d", + // data[3], data[2], data[1], data[0], + // path->eop, path->nloop, mode, path->nreg, tag.PRE); + } - u32 GetReg() - { - return (regs >> reg) & 0xf; - } + u32 GetReg() + { + return (regs >> reg) & 0xf; + } - bool StepReg() - { - reg += 4; + bool StepReg() + { + reg += 4; - if (reg == nreg) - { - reg = 0; - nloop--; + if (reg == nreg) { + reg = 0; + nloop--; - if (nloop == 0) return false; - } + if (nloop == 0) + return false; + } - return true; - } + return true; + } } pathInfo; -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 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 GIFPackedRegHandlers[]; extern GIFRegHandler GIFRegHandlers[]; -#endif // GIFTRANSFER_H_INCLUDED +#endif // GIFTRANSFER_H_INCLUDED diff --git a/plugins/GSnull/Linux/Config.cpp b/plugins/GSnull/Linux/Config.cpp index 20b3797a57..3bfd4ba201 100644 --- a/plugins/GSnull/Linux/Config.cpp +++ b/plugins/GSnull/Linux/Config.cpp @@ -27,41 +27,39 @@ PluginConf Ini; void CFGabout() { - SysMessage("GSnull: A simple null plugin."); + SysMessage("GSnull: A simple null plugin."); } void CFGconfigure() { - LoadConfig(); - PluginNullConfigure("Since this is a null plugin, all that is really configurable is logging.", conf.Log); - SaveConfig(); + LoadConfig(); + PluginNullConfigure("Since this is a null plugin, all that is really configurable is logging.", conf.Log); + SaveConfig(); } void LoadConfig() { const std::string iniFile(s_strIniPath + "/GSNull.ini"); - if (!Ini.Open(iniFile, READ_FILE)) - { - printf("failed to open %s\n", iniFile.c_str()); - SaveConfig();//save and return - return; - } + if (!Ini.Open(iniFile, READ_FILE)) { + printf("failed to open %s\n", iniFile.c_str()); + SaveConfig(); //save and return + return; + } - conf.Log = Ini.ReadInt("logging", 0); - Ini.Close(); + conf.Log = Ini.ReadInt("logging", 0); + Ini.Close(); } void SaveConfig() { const std::string iniFile(s_strIniPath + "/GSNull.ini"); - if (!Ini.Open(iniFile, WRITE_FILE)) - { - printf("failed to open %s\n", iniFile.c_str()); - return; - } + if (!Ini.Open(iniFile, WRITE_FILE)) { + printf("failed to open %s\n", iniFile.c_str()); + return; + } - Ini.WriteInt("logging", conf.Log); - Ini.Close(); + Ini.WriteInt("logging", conf.Log); + Ini.Close(); } diff --git a/plugins/GSnull/Linux/Config.h b/plugins/GSnull/Linux/Config.h index 5b691e066f..0cb5f0767e 100644 --- a/plugins/GSnull/Linux/Config.h +++ b/plugins/GSnull/Linux/Config.h @@ -19,6 +19,6 @@ void SaveConf(); void LoadConf(); -extern long CFGmessage(char *msg); +extern long CFGmessage(char* msg); extern void CFGconfigure(); extern void CFGabout(); diff --git a/plugins/GSnull/Linux/GSLinux.cpp b/plugins/GSnull/Linux/GSLinux.cpp index 9f8349a200..c583be1a88 100644 --- a/plugins/GSnull/Linux/GSLinux.cpp +++ b/plugins/GSnull/Linux/GSLinux.cpp @@ -16,32 +16,32 @@ #include "GS.h" #include "GSLinux.h" -Display *display; +Display* display; int screen; -GtkScrolledWindow *win; +GtkScrolledWindow* win; -int GSOpenWindow(void *pDsp, const char *Title) +int GSOpenWindow(void* pDsp, const char* Title) { - display = XOpenDisplay(0); - screen = DefaultScreen(display); + display = XOpenDisplay(0); + screen = DefaultScreen(display); - if (pDsp != NULL) - *(Display**)pDsp = display; - else - return -1; + if (pDsp != NULL) + *(Display**)pDsp = display; + else + return -1; - return 0; + return 0; } -int GSOpenWindow2(void *pDsp, u32 flags) +int GSOpenWindow2(void* pDsp, u32 flags) { - GtkWidget *widget; - if (pDsp != NULL) - win = *(GtkScrolledWindow**)pDsp; - else - return -1; + GtkWidget* widget; + if (pDsp != NULL) + win = *(GtkScrolledWindow**)pDsp; + else + return -1; - return 0; + return 0; } void GSCloseWindow() @@ -52,67 +52,62 @@ void GSCloseWindow() void GSProcessMessages() { - if ( GSKeyEvent ) - { - int myKeyEvent = GSKeyEvent; - bool myShift = GSShift; - GSKeyEvent = 0; + if (GSKeyEvent) { + int myKeyEvent = GSKeyEvent; + bool myShift = GSShift; + GSKeyEvent = 0; - switch ( myKeyEvent ) - { - case XK_F5: - OnKeyboardF5(myShift); - break; - case XK_F6: - OnKeyboardF6(myShift); - break; - case XK_F7: - OnKeyboardF7(myShift); - break; - case XK_F9: - OnKeyboardF9(myShift); - break; - } - } + switch (myKeyEvent) { + case XK_F5: + OnKeyboardF5(myShift); + break; + case XK_F6: + OnKeyboardF6(myShift); + break; + case XK_F7: + OnKeyboardF7(myShift); + break; + case XK_F9: + OnKeyboardF9(myShift); + break; + } + } } -void HandleKeyEvent(keyEvent *ev) +void HandleKeyEvent(keyEvent* ev) { - switch(ev->evt) - { - case KEYPRESS: - switch(ev->key) - { - case XK_F5: - case XK_F6: - case XK_F7: - case XK_F9: - GSKeyEvent = ev->key ; - break; - case XK_Escape: - break; - case XK_Shift_L: - case XK_Shift_R: - GSShift = true; - break; - case XK_Alt_L: - case XK_Alt_R: - GSAlt = true; - break; - } - break; - case KEYRELEASE: - switch(ev->key) - { - case XK_Shift_L: - case XK_Shift_R: - GSShift = false; - break; - case XK_Alt_L: - case XK_Alt_R: - GSAlt = false; - break; - } - } + switch (ev->evt) { + case KEYPRESS: + switch (ev->key) { + case XK_F5: + case XK_F6: + case XK_F7: + case XK_F9: + GSKeyEvent = ev->key; + break; + case XK_Escape: + break; + case XK_Shift_L: + case XK_Shift_R: + GSShift = true; + break; + case XK_Alt_L: + case XK_Alt_R: + GSAlt = true; + break; + } + break; + case KEYRELEASE: + switch (ev->key) { + case XK_Shift_L: + case XK_Shift_R: + GSShift = false; + break; + case XK_Alt_L: + case XK_Alt_R: + GSAlt = false; + break; + } + } } diff --git a/plugins/GSnull/Linux/GSLinux.h b/plugins/GSnull/Linux/GSLinux.h index 5b872ef223..c775b46088 100644 --- a/plugins/GSnull/Linux/GSLinux.h +++ b/plugins/GSnull/Linux/GSLinux.h @@ -20,10 +20,10 @@ #include #include -extern int GSOpenWindow(void *pDsp, const char *Title); -extern int GSOpenWindow2(void *pDsp, u32 flags); +extern int GSOpenWindow(void* pDsp, const char* Title); +extern int GSOpenWindow2(void* pDsp, u32 flags); extern void GSCloseWindow(); extern void GSProcessMessages(); -extern void HandleKeyEvent(keyEvent *ev); +extern void HandleKeyEvent(keyEvent* ev); #endif diff --git a/plugins/GSnull/Linux/Linux.cpp b/plugins/GSnull/Linux/Linux.cpp index 2d317a4702..23c9cd431a 100644 --- a/plugins/GSnull/Linux/Linux.cpp +++ b/plugins/GSnull/Linux/Linux.cpp @@ -19,13 +19,14 @@ #include "GS.h" #include "Config.h" -EXPORT_C_(void) GSconfigure() +EXPORT_C_(void) +GSconfigure() { - CFGconfigure(); + CFGconfigure(); } -EXPORT_C_(void) GSabout() +EXPORT_C_(void) +GSabout() { - CFGabout(); + CFGabout(); } - diff --git a/plugins/GSnull/Registers.cpp b/plugins/GSnull/Registers.cpp index dbc892ef23..650f630fbd 100644 --- a/plugins/GSnull/Registers.cpp +++ b/plugins/GSnull/Registers.cpp @@ -15,14 +15,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ - + #include "GS.h" #include "Registers.h" GIFRegHandler GIFPackedRegHandlers[16]; 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. void __gifCall GIFPackedRegHandlerNull(const u32* data) @@ -33,15 +33,15 @@ void __gifCall GIFPackedRegHandlerNull(const u32* data) void __gifCall GIFPackedRegHandlerPRIM(const u32* data) { GIFRegHandlerPRIM(data); } template -void __gifCall GIFPackedRegHandlerTEX0(const u32* data) -{ - GIFRegHandlerTEX0(data); +void __gifCall GIFPackedRegHandlerTEX0(const u32* data) +{ + GIFRegHandlerTEX0(data); } template -void __gifCall GIFPackedRegHandlerCLAMP(const u32* data) -{ - GIFRegHandlerCLAMP(data); +void __gifCall GIFPackedRegHandlerCLAMP(const u32* data) +{ + GIFRegHandlerCLAMP(data); } void __gifCall GIFPackedRegHandlerTEX0_1(const u32* data) { GIFRegHandlerTEX0<0>(data); } @@ -53,27 +53,27 @@ void __gifCall GIFPackedRegHandlerXYZ3(const u32* data) { GIFRegHandlerXYZ3(data void __gifCall GIFPackedRegHandlerRGBA(const u32* data) { - GIFPackedRGBA* r = (GIFPackedRGBA*)(data); - gs.regs.RGBAQ.R = r->R; - gs.regs.RGBAQ.G = r->G; - gs.regs.RGBAQ.B = r->B; - gs.regs.RGBAQ.A = r->A; - gs.regs.RGBAQ.Q = gs.q; + GIFPackedRGBA* r = (GIFPackedRGBA*)(data); + gs.regs.RGBAQ.R = r->R; + gs.regs.RGBAQ.G = r->G; + gs.regs.RGBAQ.B = r->B; + gs.regs.RGBAQ.A = r->A; + gs.regs.RGBAQ.Q = gs.q; } void __gifCall GIFPackedRegHandlerSTQ(const u32* data) { - GIFPackedSTQ* r = (GIFPackedSTQ*)(data); - gs.regs.ST.S = r->S; - gs.regs.ST.T = r->T; - gs.q = r->Q; + GIFPackedSTQ* r = (GIFPackedSTQ*)(data); + gs.regs.ST.S = r->S; + gs.regs.ST.T = r->T; + gs.q = r->Q; } void __gifCall GIFPackedRegHandlerUV(const u32* data) { - GIFPackedUV* r = (GIFPackedUV*)(data); - gs.regs.UV.U = r->U; - gs.regs.UV.V = r->V; + GIFPackedUV* r = (GIFPackedUV*)(data); + gs.regs.UV.U = r->U; + gs.regs.UV.V = r->V; } void __gifCall KickVertex(bool adc) @@ -82,32 +82,32 @@ void __gifCall KickVertex(bool adc) void __gifCall GIFPackedRegHandlerXYZF2(const u32* data) { - GIFPackedXYZF2* r = (GIFPackedXYZF2*)(data); - gs.regs.XYZ.X = r->X; - gs.regs.XYZ.Y = r->Y; - gs.regs.XYZ.Z = r->Z; - gs.regs.FOG.F = r->F; + GIFPackedXYZF2* r = (GIFPackedXYZF2*)(data); + gs.regs.XYZ.X = r->X; + gs.regs.XYZ.Y = r->Y; + gs.regs.XYZ.Z = r->Z; + gs.regs.FOG.F = r->F; } void __gifCall GIFPackedRegHandlerXYZ2(const u32* data) { - GIFPackedXYZ2* r = (GIFPackedXYZ2*)(data); - gs.regs.XYZ.X = r->X; - gs.regs.XYZ.Y = r->Y; - gs.regs.XYZ.Z = r->Z; + GIFPackedXYZ2* r = (GIFPackedXYZ2*)(data); + gs.regs.XYZ.X = r->X; + gs.regs.XYZ.Y = r->Y; + gs.regs.XYZ.Z = r->Z; } void __gifCall GIFPackedRegHandlerFOG(const u32* data) { - GIFPackedFOG* r = (GIFPackedFOG*)(data); - gs.regs.FOG.F = r->F; + GIFPackedFOG* r = (GIFPackedFOG*)(data); + gs.regs.FOG.F = r->F; } void __gifCall GIFPackedRegHandlerA_D(const u32* data) { - GIFPackedA_D* r = (GIFPackedA_D*)(data); - - GIFRegHandlers[r->ADDR](data); + GIFPackedA_D* r = (GIFPackedA_D*)(data); + + GIFRegHandlers[r->ADDR](data); } void __gifCall GIFPackedRegHandlerNOP(const u32* data) @@ -120,64 +120,64 @@ void __gifCall GIFRegHandlerNull(const u32* data) void __gifCall GIFRegHandlerRGBAQ(const u32* data) { - GIFRegRGBAQ* r = (GIFRegRGBAQ*)(data); - gs.regs.RGBAQ._u64 = r->_u64; + GIFRegRGBAQ* r = (GIFRegRGBAQ*)(data); + gs.regs.RGBAQ._u64 = r->_u64; } void __gifCall GIFRegHandlerST(const u32* data) { - GIFRegST* r = (GIFRegST*)(data); - gs.regs.ST._u64 = r->_u64; + GIFRegST* r = (GIFRegST*)(data); + gs.regs.ST._u64 = r->_u64; } void __gifCall GIFRegHandlerUV(const u32* data) { - GIFRegUV* r = (GIFRegUV*)(data); - gs.regs.UV._u64 = r->_u64; + GIFRegUV* r = (GIFRegUV*)(data); + gs.regs.UV._u64 = r->_u64; } void __gifCall GIFRegHandlerXYZF2(const u32* data) { - GIFRegXYZF* r = (GIFRegXYZF*)(data); - gs.regs.XYZF._u64 = r->_u64; + GIFRegXYZF* r = (GIFRegXYZF*)(data); + gs.regs.XYZF._u64 = r->_u64; } void __gifCall GIFRegHandlerXYZ2(const u32* data) { - GIFRegXYZ* r = (GIFRegXYZ*)(data); - gs.regs.XYZ._u64 = r->_u64; + GIFRegXYZ* r = (GIFRegXYZ*)(data); + gs.regs.XYZ._u64 = r->_u64; } template void __gifCall GIFRegHandlerTEX0(const u32* data) { - GIFRegTEX0* r = (GIFRegTEX0*)(data); - gs.ctxt_regs[i].TEX0._u64 = r->_u64; + GIFRegTEX0* r = (GIFRegTEX0*)(data); + gs.ctxt_regs[i].TEX0._u64 = r->_u64; } template void __gifCall GIFRegHandlerCLAMP(const u32* data) { - GIFRegCLAMP* r = (GIFRegCLAMP*)(data); - gs.ctxt_regs[i].CLAMP._u64 = r->_u64; + GIFRegCLAMP* r = (GIFRegCLAMP*)(data); + gs.ctxt_regs[i].CLAMP._u64 = r->_u64; } void __gifCall GIFRegHandlerFOG(const u32* data) { - GIFRegFOG* r = (GIFRegFOG*)(data); - gs.regs.FOG.F = r->F; + GIFRegFOG* r = (GIFRegFOG*)(data); + gs.regs.FOG.F = r->F; } void __gifCall GIFRegHandlerXYZF3(const u32* data) { - GIFRegXYZF* r = (GIFRegXYZF*)(data); - gs.regs.XYZF._u64 = r->_u64; + GIFRegXYZF* r = (GIFRegXYZF*)(data); + gs.regs.XYZF._u64 = r->_u64; } void __gifCall GIFRegHandlerXYZ3(const u32* data) { - GIFRegXYZ* r = (GIFRegXYZ*)(data); - gs.regs.XYZ._u64 = r->_u64; + GIFRegXYZ* r = (GIFRegXYZ*)(data); + gs.regs.XYZ._u64 = r->_u64; } void __gifCall GIFRegHandlerNOP(const u32* data) @@ -187,360 +187,352 @@ void __gifCall GIFRegHandlerNOP(const u32* data) template void __fastcall GIFRegHandlerTEX1(const u32* data) { - GIFRegTEX1* r = (GIFRegTEX1*)(data); - gs.ctxt_regs[i].TEX1._u64 = r->_u64; + GIFRegTEX1* r = (GIFRegTEX1*)(data); + gs.ctxt_regs[i].TEX1._u64 = r->_u64; } template void __gifCall GIFRegHandlerTEX2(const u32* data) { - GIFRegTEX2* r = (GIFRegTEX2*)(data); - gs.ctxt_regs[i].TEX2._u64 = r->_u64; + GIFRegTEX2* r = (GIFRegTEX2*)(data); + gs.ctxt_regs[i].TEX2._u64 = r->_u64; } template void __gifCall GIFRegHandlerXYOFFSET(const u32* data) { - GIFRegXYOFFSET* r = (GIFRegXYOFFSET*)(data); - gs.ctxt_regs[i].XYOFFSET.OFX = r->OFX; - gs.ctxt_regs[i].XYOFFSET.OFY = r->OFY; + GIFRegXYOFFSET* r = (GIFRegXYOFFSET*)(data); + gs.ctxt_regs[i].XYOFFSET.OFX = r->OFX; + gs.ctxt_regs[i].XYOFFSET.OFY = r->OFY; } // Fill out the vertex queue(prim) and the attributes. -void __gifCall GIFRegHandlerPRIM(const u32 *data) +void __gifCall GIFRegHandlerPRIM(const u32* data) { - GIFRegPRIM* r = (GIFRegPRIM*)(data); - gs.regs.PRIM._u64 = r->_u64; + GIFRegPRIM* r = (GIFRegPRIM*)(data); + gs.regs.PRIM._u64 = r->_u64; } // Fill out an alternate set of attributes. void __gifCall GIFRegHandlerPRMODE(const u32* data) { - GIFRegPRMODE* r = (GIFRegPRMODE*)(data); - gs.regs.PRMODE._u64 = r->_u64; + GIFRegPRMODE* r = (GIFRegPRMODE*)(data); + gs.regs.PRMODE._u64 = r->_u64; } // Switch between the primary set of attributes and the secondary. void __gifCall GIFRegHandlerPRMODECONT(const u32* data) { - GIFRegPRMODECONT* r = (GIFRegPRMODECONT*)(data); - gs.regs.PRMODECONT._u64 = r->_u64; + GIFRegPRMODECONT* r = (GIFRegPRMODECONT*)(data); + gs.regs.PRMODECONT._u64 = r->_u64; } void __gifCall GIFRegHandlerTEXCLUT(const u32* data) { - GIFRegTEXCLUT* r = (GIFRegTEXCLUT*)(data); - gs.regs.TEXCLUT._u64 = r->_u64; + GIFRegTEXCLUT* r = (GIFRegTEXCLUT*)(data); + gs.regs.TEXCLUT._u64 = r->_u64; } void __gifCall GIFRegHandlerSCANMSK(const u32* data) { - GIFRegSCANMSK* r = (GIFRegSCANMSK*)(data); - gs.regs.SCANMSK._u64 = r->_u64; + GIFRegSCANMSK* r = (GIFRegSCANMSK*)(data); + gs.regs.SCANMSK._u64 = r->_u64; } template void __gifCall GIFRegHandlerMIPTBP1(const u32* data) { - GIFRegMIPTBP1* r = (GIFRegMIPTBP1*)(data); - gs.ctxt_regs[i].MIPTBP1._u64 = r->_u64; + GIFRegMIPTBP1* r = (GIFRegMIPTBP1*)(data); + gs.ctxt_regs[i].MIPTBP1._u64 = r->_u64; } template void __gifCall GIFRegHandlerMIPTBP2(const u32* data) { - GIFRegMIPTBP2* r = (GIFRegMIPTBP2*)(data); - gs.ctxt_regs[i].MIPTBP2._u64 = r->_u64; + GIFRegMIPTBP2* r = (GIFRegMIPTBP2*)(data); + gs.ctxt_regs[i].MIPTBP2._u64 = r->_u64; } void __gifCall GIFRegHandlerTEXA(const u32* data) { - GIFRegTEXA* r = (GIFRegTEXA*)(data); - gs.regs.TEXA._u64 = r->_u64; + GIFRegTEXA* r = (GIFRegTEXA*)(data); + gs.regs.TEXA._u64 = r->_u64; } void __gifCall GIFRegHandlerFOGCOL(const u32* data) { - GIFRegFOGCOL* r = (GIFRegFOGCOL*)(data); - gs.regs.FOGCOL._u64 = r->_u64; + GIFRegFOGCOL* r = (GIFRegFOGCOL*)(data); + gs.regs.FOGCOL._u64 = r->_u64; } void __gifCall GIFRegHandlerTEXFLUSH(const u32* data) { - GIFRegTEXFLUSH* r = (GIFRegTEXFLUSH*)(data); - gs.regs.TEXFLUSH._u64 = r->_u64; + GIFRegTEXFLUSH* r = (GIFRegTEXFLUSH*)(data); + gs.regs.TEXFLUSH._u64 = r->_u64; } template void __gifCall GIFRegHandlerSCISSOR(const u32* data) { - GIFRegSCISSOR* r = (GIFRegSCISSOR*)(data); - gs.ctxt_regs[i].SCISSOR._u64 = r->_u64; + GIFRegSCISSOR* r = (GIFRegSCISSOR*)(data); + gs.ctxt_regs[i].SCISSOR._u64 = r->_u64; } template void __gifCall GIFRegHandlerALPHA(const u32* data) { - GIFRegALPHA* r = (GIFRegALPHA*)(data); - gs.ctxt_regs[i].ALPHA._u64 = r->_u64; + GIFRegALPHA* r = (GIFRegALPHA*)(data); + gs.ctxt_regs[i].ALPHA._u64 = r->_u64; } void __gifCall GIFRegHandlerDIMX(const u32* data) { - GIFRegDIMX* r = (GIFRegDIMX*)(data); - gs.regs.DIMX._u64 = r->_u64; + GIFRegDIMX* r = (GIFRegDIMX*)(data); + gs.regs.DIMX._u64 = r->_u64; } void __gifCall GIFRegHandlerDTHE(const u32* data) { - GIFRegDTHE* r = (GIFRegDTHE*)(data); - gs.regs.DTHE._u64 = r->_u64; + GIFRegDTHE* r = (GIFRegDTHE*)(data); + gs.regs.DTHE._u64 = r->_u64; } void __gifCall GIFRegHandlerCOLCLAMP(const u32* data) { - GIFRegCOLCLAMP* r = (GIFRegCOLCLAMP*)(data); - gs.regs.COLCLAMP._u64 = r->_u64; + GIFRegCOLCLAMP* r = (GIFRegCOLCLAMP*)(data); + gs.regs.COLCLAMP._u64 = r->_u64; } template void __gifCall GIFRegHandlerTEST(const u32* data) { - GIFRegTEST* r = (GIFRegTEST*)(data); - gs.ctxt_regs[i].TEST._u64 = r->_u64; + GIFRegTEST* r = (GIFRegTEST*)(data); + gs.ctxt_regs[i].TEST._u64 = r->_u64; } void __gifCall GIFRegHandlerPABE(const u32* data) { - GIFRegPABE* r = (GIFRegPABE*)(data); - gs.regs.PABE._u64 = r->_u64; + GIFRegPABE* r = (GIFRegPABE*)(data); + gs.regs.PABE._u64 = r->_u64; } template void __gifCall GIFRegHandlerFBA(const u32* data) { - GIFRegFBA* r = (GIFRegFBA*)(data); - gs.ctxt_regs[i].FBA._u64 = r->_u64; + GIFRegFBA* r = (GIFRegFBA*)(data); + gs.ctxt_regs[i].FBA._u64 = r->_u64; } -template +template void __gifCall GIFRegHandlerFRAME(const u32* data) { - GIFRegFRAME* r = (GIFRegFRAME*)(data); - gs.ctxt_regs[i].FRAME._u64 = r->_u64; + GIFRegFRAME* r = (GIFRegFRAME*)(data); + gs.ctxt_regs[i].FRAME._u64 = r->_u64; } template void __gifCall GIFRegHandlerZBUF(const u32* data) { - GIFRegZBUF* r = (GIFRegZBUF*)(data); - gs.ctxt_regs[i].ZBUF._u64 = r->_u64; + GIFRegZBUF* r = (GIFRegZBUF*)(data); + gs.ctxt_regs[i].ZBUF._u64 = r->_u64; } void __gifCall GIFRegHandlerBITBLTBUF(const u32* data) { - GIFRegBITBLTBUF* r = (GIFRegBITBLTBUF*)(data); - gs.regs.BITBLTBUF._u64 = r->_u64; + GIFRegBITBLTBUF* r = (GIFRegBITBLTBUF*)(data); + gs.regs.BITBLTBUF._u64 = r->_u64; } void __gifCall GIFRegHandlerTRXPOS(const u32* data) { - GIFRegTRXPOS* r = (GIFRegTRXPOS*)(data); - gs.regs.TRXPOS._u64 = r->_u64; + GIFRegTRXPOS* r = (GIFRegTRXPOS*)(data); + gs.regs.TRXPOS._u64 = r->_u64; } void __gifCall GIFRegHandlerTRXREG(const u32* data) { - GIFRegTRXREG* r = (GIFRegTRXREG*)(data); - gs.regs.TRXREG._u64 = r->_u64; + GIFRegTRXREG* r = (GIFRegTRXREG*)(data); + gs.regs.TRXREG._u64 = r->_u64; } void __gifCall GIFRegHandlerTRXDIR(const u32* data) { - GIFRegTRXDIR* r = (GIFRegTRXDIR*)(data); - gs.regs.TRXDIR._u64 = r->_u64; + GIFRegTRXDIR* r = (GIFRegTRXDIR*)(data); + gs.regs.TRXDIR._u64 = r->_u64; } void __gifCall GIFRegHandlerHWREG(const u32* data) { - GIFRegHWREG* r = (GIFRegHWREG*)(data); - gs.regs.HWREG._u64 = r->_u64; + GIFRegHWREG* r = (GIFRegHWREG*)(data); + gs.regs.HWREG._u64 = r->_u64; } void __gifCall GIFRegHandlerSIGNAL(const u32* data) { - GIFRegSIGNAL* r = (GIFRegSIGNAL*)(data); - gs.regs.SIGNAL._u64 = r->_u64; + GIFRegSIGNAL* r = (GIFRegSIGNAL*)(data); + gs.regs.SIGNAL._u64 = r->_u64; } void __gifCall GIFRegHandlerFINISH(const u32* data) { - GIFRegFINISH* r = (GIFRegFINISH*)(data); - gs.regs.FINISH._u64 = r->_u64; + GIFRegFINISH* r = (GIFRegFINISH*)(data); + gs.regs.FINISH._u64 = r->_u64; } void __gifCall GIFRegHandlerLABEL(const u32* data) { - GIFRegLABEL* r = (GIFRegLABEL*)(data); - gs.regs.LABEL._u64 = r->_u64; + GIFRegLABEL* r = (GIFRegLABEL*)(data); + gs.regs.LABEL._u64 = r->_u64; } void SetMultithreaded() { - // Some older versions of PCSX2 didn't properly set the irq callback to NULL - // in multithreaded mode (possibly because ZeroGS itself would assert in such - // cases), and didn't bind them to a dummy callback either. PCSX2 handles all - // IRQs internally when multithreaded anyway -- so let's ignore them here: + // Some older versions of PCSX2 didn't properly set the irq callback to NULL + // in multithreaded mode (possibly because ZeroGS itself would assert in such + // cases), and didn't bind them to a dummy callback either. PCSX2 handles all + // IRQs internally when multithreaded anyway -- so let's ignore them here: - if (gs.MultiThreaded) - { - GIFRegHandlers[GIF_A_D_REG_SIGNAL] = &GIFRegHandlerNull; - GIFRegHandlers[GIF_A_D_REG_FINISH] = &GIFRegHandlerNull; - GIFRegHandlers[GIF_A_D_REG_LABEL] = &GIFRegHandlerNull; - } - else - { - GIFRegHandlers[GIF_A_D_REG_SIGNAL] = &GIFRegHandlerSIGNAL; - GIFRegHandlers[GIF_A_D_REG_FINISH] = &GIFRegHandlerFINISH; - GIFRegHandlers[GIF_A_D_REG_LABEL] = &GIFRegHandlerLABEL; - } + if (gs.MultiThreaded) { + GIFRegHandlers[GIF_A_D_REG_SIGNAL] = &GIFRegHandlerNull; + GIFRegHandlers[GIF_A_D_REG_FINISH] = &GIFRegHandlerNull; + GIFRegHandlers[GIF_A_D_REG_LABEL] = &GIFRegHandlerNull; + } else { + GIFRegHandlers[GIF_A_D_REG_SIGNAL] = &GIFRegHandlerSIGNAL; + GIFRegHandlers[GIF_A_D_REG_FINISH] = &GIFRegHandlerFINISH; + GIFRegHandlers[GIF_A_D_REG_LABEL] = &GIFRegHandlerLABEL; + } } void ResetRegs() { - for (int i = 0; i < 16; i++) - { - GIFPackedRegHandlers[i] = &GIFPackedRegHandlerNull; - } + for (int i = 0; i < 16; i++) { + GIFPackedRegHandlers[i] = &GIFPackedRegHandlerNull; + } - 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++) - { - GIFRegHandlers[i] = &GIFRegHandlerNull; - } - - 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(); + 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++) { + GIFRegHandlers[i] = &GIFRegHandlerNull; + } + + 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(); } void SetFrameSkip(bool skip) { - if (skip) - { - 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; + if (skip) { + 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; - 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 - { - 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; + 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 { + 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; - 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; - } + 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/GSnull/Registers.h b/plugins/GSnull/Registers.h index ca9fbd590b..62a8a6c261 100644 --- a/plugins/GSnull/Registers.h +++ b/plugins/GSnull/Registers.h @@ -21,8 +21,7 @@ #define __REGISTERS_H__ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #define GSdefs #include "PS2Edefs.h" @@ -36,82 +35,80 @@ extern "C" #pragma pack(push, 1) -enum GIF_REG -{ - GIF_REG_PRIM = 0x00, - GIF_REG_RGBA = 0x01, - GIF_REG_STQ = 0x02, - GIF_REG_UV = 0x03, - GIF_REG_XYZF2 = 0x04, - GIF_REG_XYZ2 = 0x05, - GIF_REG_TEX0_1 = 0x06, - GIF_REG_TEX0_2 = 0x07, - GIF_REG_CLAMP_1 = 0x08, - GIF_REG_CLAMP_2 = 0x09, - GIF_REG_FOG = 0x0a, - GIF_REG_XYZF3 = 0x0c, - GIF_REG_XYZ3 = 0x0d, - GIF_REG_A_D = 0x0e, - GIF_REG_NOP = 0x0f, +enum GIF_REG { + GIF_REG_PRIM = 0x00, + GIF_REG_RGBA = 0x01, + GIF_REG_STQ = 0x02, + GIF_REG_UV = 0x03, + GIF_REG_XYZF2 = 0x04, + GIF_REG_XYZ2 = 0x05, + GIF_REG_TEX0_1 = 0x06, + GIF_REG_TEX0_2 = 0x07, + GIF_REG_CLAMP_1 = 0x08, + GIF_REG_CLAMP_2 = 0x09, + GIF_REG_FOG = 0x0a, + GIF_REG_XYZF3 = 0x0c, + GIF_REG_XYZ3 = 0x0d, + GIF_REG_A_D = 0x0e, + GIF_REG_NOP = 0x0f, }; -enum GIF_A_D_REG -{ - GIF_A_D_REG_PRIM = 0x00, - GIF_A_D_REG_RGBAQ = 0x01, - GIF_A_D_REG_ST = 0x02, - GIF_A_D_REG_UV = 0x03, - GIF_A_D_REG_XYZF2 = 0x04, - GIF_A_D_REG_XYZ2 = 0x05, - GIF_A_D_REG_TEX0_1 = 0x06, - GIF_A_D_REG_TEX0_2 = 0x07, - GIF_A_D_REG_CLAMP_1 = 0x08, - GIF_A_D_REG_CLAMP_2 = 0x09, - GIF_A_D_REG_FOG = 0x0a, - GIF_A_D_REG_XYZF3 = 0x0c, - GIF_A_D_REG_XYZ3 = 0x0d, - GIF_A_D_REG_NOP = 0x0f, - GIF_A_D_REG_TEX1_1 = 0x14, - GIF_A_D_REG_TEX1_2 = 0x15, - GIF_A_D_REG_TEX2_1 = 0x16, - GIF_A_D_REG_TEX2_2 = 0x17, - GIF_A_D_REG_XYOFFSET_1 = 0x18, - GIF_A_D_REG_XYOFFSET_2 = 0x19, - GIF_A_D_REG_PRMODECONT = 0x1a, - GIF_A_D_REG_PRMODE = 0x1b, - GIF_A_D_REG_TEXCLUT = 0x1c, - GIF_A_D_REG_SCANMSK = 0x22, - GIF_A_D_REG_MIPTBP1_1 = 0x34, - GIF_A_D_REG_MIPTBP1_2 = 0x35, - GIF_A_D_REG_MIPTBP2_1 = 0x36, - GIF_A_D_REG_MIPTBP2_2 = 0x37, - GIF_A_D_REG_TEXA = 0x3b, - GIF_A_D_REG_FOGCOL = 0x3d, - GIF_A_D_REG_TEXFLUSH = 0x3f, - GIF_A_D_REG_SCISSOR_1 = 0x40, - GIF_A_D_REG_SCISSOR_2 = 0x41, - GIF_A_D_REG_ALPHA_1 = 0x42, - GIF_A_D_REG_ALPHA_2 = 0x43, - GIF_A_D_REG_DIMX = 0x44, - GIF_A_D_REG_DTHE = 0x45, - GIF_A_D_REG_COLCLAMP = 0x46, - GIF_A_D_REG_TEST_1 = 0x47, - GIF_A_D_REG_TEST_2 = 0x48, - GIF_A_D_REG_PABE = 0x49, - GIF_A_D_REG_FBA_1 = 0x4a, - GIF_A_D_REG_FBA_2 = 0x4b, - GIF_A_D_REG_FRAME_1 = 0x4c, - GIF_A_D_REG_FRAME_2 = 0x4d, - GIF_A_D_REG_ZBUF_1 = 0x4e, - GIF_A_D_REG_ZBUF_2 = 0x4f, - GIF_A_D_REG_BITBLTBUF = 0x50, - GIF_A_D_REG_TRXPOS = 0x51, - GIF_A_D_REG_TRXREG = 0x52, - GIF_A_D_REG_TRXDIR = 0x53, - GIF_A_D_REG_HWREG = 0x54, - GIF_A_D_REG_SIGNAL = 0x60, - GIF_A_D_REG_FINISH = 0x61, - GIF_A_D_REG_LABEL = 0x62, +enum GIF_A_D_REG { + GIF_A_D_REG_PRIM = 0x00, + GIF_A_D_REG_RGBAQ = 0x01, + GIF_A_D_REG_ST = 0x02, + GIF_A_D_REG_UV = 0x03, + GIF_A_D_REG_XYZF2 = 0x04, + GIF_A_D_REG_XYZ2 = 0x05, + GIF_A_D_REG_TEX0_1 = 0x06, + GIF_A_D_REG_TEX0_2 = 0x07, + GIF_A_D_REG_CLAMP_1 = 0x08, + GIF_A_D_REG_CLAMP_2 = 0x09, + GIF_A_D_REG_FOG = 0x0a, + GIF_A_D_REG_XYZF3 = 0x0c, + GIF_A_D_REG_XYZ3 = 0x0d, + GIF_A_D_REG_NOP = 0x0f, + GIF_A_D_REG_TEX1_1 = 0x14, + GIF_A_D_REG_TEX1_2 = 0x15, + GIF_A_D_REG_TEX2_1 = 0x16, + GIF_A_D_REG_TEX2_2 = 0x17, + GIF_A_D_REG_XYOFFSET_1 = 0x18, + GIF_A_D_REG_XYOFFSET_2 = 0x19, + GIF_A_D_REG_PRMODECONT = 0x1a, + GIF_A_D_REG_PRMODE = 0x1b, + GIF_A_D_REG_TEXCLUT = 0x1c, + GIF_A_D_REG_SCANMSK = 0x22, + GIF_A_D_REG_MIPTBP1_1 = 0x34, + GIF_A_D_REG_MIPTBP1_2 = 0x35, + GIF_A_D_REG_MIPTBP2_1 = 0x36, + GIF_A_D_REG_MIPTBP2_2 = 0x37, + GIF_A_D_REG_TEXA = 0x3b, + GIF_A_D_REG_FOGCOL = 0x3d, + GIF_A_D_REG_TEXFLUSH = 0x3f, + GIF_A_D_REG_SCISSOR_1 = 0x40, + GIF_A_D_REG_SCISSOR_2 = 0x41, + GIF_A_D_REG_ALPHA_1 = 0x42, + GIF_A_D_REG_ALPHA_2 = 0x43, + GIF_A_D_REG_DIMX = 0x44, + GIF_A_D_REG_DTHE = 0x45, + GIF_A_D_REG_COLCLAMP = 0x46, + GIF_A_D_REG_TEST_1 = 0x47, + GIF_A_D_REG_TEST_2 = 0x48, + GIF_A_D_REG_PABE = 0x49, + GIF_A_D_REG_FBA_1 = 0x4a, + GIF_A_D_REG_FBA_2 = 0x4b, + GIF_A_D_REG_FRAME_1 = 0x4c, + GIF_A_D_REG_FRAME_2 = 0x4d, + GIF_A_D_REG_ZBUF_1 = 0x4e, + GIF_A_D_REG_ZBUF_2 = 0x4f, + GIF_A_D_REG_BITBLTBUF = 0x50, + GIF_A_D_REG_TRXPOS = 0x51, + GIF_A_D_REG_TRXREG = 0x52, + GIF_A_D_REG_TRXDIR = 0x53, + GIF_A_D_REG_HWREG = 0x54, + GIF_A_D_REG_SIGNAL = 0x60, + GIF_A_D_REG_FINISH = 0x61, + GIF_A_D_REG_LABEL = 0x62, }; // In case we want to change to/from __fastcall for GIF register handlers: @@ -133,10 +130,10 @@ extern FnType_GIFRegHandler GIFPackedRegHandlerNOP; // These are unimplemented, and fall back on the non-packed versions. extern FnType_GIFRegHandler GIFPackedRegHandlerPRIM; -template +template extern FnType_GIFRegHandler GIFPackedRegHandlerTEX0; -template +template extern FnType_GIFRegHandler GIFPackedRegHandlerCLAMP; extern FnType_GIFRegHandler GIFPackedRegHandlerXYZF3; @@ -150,10 +147,10 @@ extern FnType_GIFRegHandler GIFRegHandlerUV; extern FnType_GIFRegHandler GIFRegHandlerXYZF2; extern FnType_GIFRegHandler GIFRegHandlerXYZ2; -template +template extern FnType_GIFRegHandler GIFRegHandlerTEX0; -template +template extern FnType_GIFRegHandler GIFRegHandlerCLAMP; extern FnType_GIFRegHandler GIFRegHandlerFOG; @@ -208,300 +205,303 @@ extern FnType_GIFRegHandler GIFRegHandlerSIGNAL; extern FnType_GIFRegHandler GIFRegHandlerFINISH; extern FnType_GIFRegHandler GIFRegHandlerLABEL; -enum GS_PRIM -{ - GS_POINTLIST = 0, - GS_LINELIST = 1, - GS_LINESTRIP = 2, - GS_TRIANGLELIST = 3, - GS_TRIANGLESTRIP = 4, - GS_TRIANGLEFAN = 5, - GS_SPRITE = 6, - GS_INVALID = 7, +enum GS_PRIM { + GS_POINTLIST = 0, + GS_LINELIST = 1, + GS_LINESTRIP = 2, + GS_TRIANGLELIST = 3, + GS_TRIANGLESTRIP = 4, + GS_TRIANGLEFAN = 5, + GS_SPRITE = 6, + GS_INVALID = 7, }; -enum GS_PRIM_CLASS -{ - GS_POINT_CLASS = 0, - GS_LINE_CLASS = 1, - GS_TRIANGLE_CLASS = 2, - GS_SPRITE_CLASS = 3, - GS_INVALID_CLASS = 7, +enum GS_PRIM_CLASS { + GS_POINT_CLASS = 0, + GS_LINE_CLASS = 1, + GS_TRIANGLE_CLASS = 2, + GS_SPRITE_CLASS = 3, + GS_INVALID_CLASS = 7, }; -enum GS_PSM -{ - PSM_PSMCT32 = 0, // 0000-0000 - PSM_PSMCT24 = 1, // 0000-0001 - PSM_PSMCT16 = 2, // 0000-0010 - PSM_PSMCT16S = 10, // 0000-1010 - PSM_PSMT8 = 19, // 0001-0011 - PSM_PSMT4 = 20, // 0001-0100 - PSM_PSMT8H = 27, // 0001-1011 - PSM_PSMT4HL = 36, // 0010-0100 - PSM_PSMT4HH = 44, // 0010-1100 - PSM_PSMZ32 = 48, // 0011-0000 - PSM_PSMZ24 = 49, // 0011-0001 - PSM_PSMZ16 = 50, // 0011-0010 - PSM_PSMZ16S = 58, // 0011-1010 +enum GS_PSM { + PSM_PSMCT32 = 0, // 0000-0000 + PSM_PSMCT24 = 1, // 0000-0001 + PSM_PSMCT16 = 2, // 0000-0010 + PSM_PSMCT16S = 10, // 0000-1010 + PSM_PSMT8 = 19, // 0001-0011 + PSM_PSMT4 = 20, // 0001-0100 + PSM_PSMT8H = 27, // 0001-1011 + PSM_PSMT4HL = 36, // 0010-0100 + PSM_PSMT4HH = 44, // 0010-1100 + PSM_PSMZ32 = 48, // 0011-0000 + PSM_PSMZ24 = 49, // 0011-0001 + PSM_PSMZ16 = 50, // 0011-0010 + PSM_PSMZ16S = 58, // 0011-1010 }; -enum GS_TFX -{ - TFX_MODULATE = 0, - TFX_DECAL = 1, - TFX_HIGHLIGHT = 2, - TFX_HIGHLIGHT2 = 3, - TFX_NONE = 4, +enum GS_TFX { + TFX_MODULATE = 0, + TFX_DECAL = 1, + TFX_HIGHLIGHT = 2, + TFX_HIGHLIGHT2 = 3, + TFX_NONE = 4, }; -enum GS_CLAMP -{ - CLAMP_REPEAT = 0, - CLAMP_CLAMP = 1, - CLAMP_REGION_CLAMP = 2, - CLAMP_REGION_REPEAT = 3, +enum GS_CLAMP { + CLAMP_REPEAT = 0, + CLAMP_CLAMP = 1, + CLAMP_REGION_CLAMP = 2, + CLAMP_REGION_REPEAT = 3, }; -enum GS_ZTST -{ - ZTST_NEVER = 0, - ZTST_ALWAYS = 1, - ZTST_GEQUAL = 2, - ZTST_GREATER = 3, +enum GS_ZTST { + ZTST_NEVER = 0, + ZTST_ALWAYS = 1, + ZTST_GEQUAL = 2, + ZTST_GREATER = 3, }; -enum GS_ATST -{ - ATST_NEVER = 0, - ATST_ALWAYS = 1, - ATST_LESS = 2, - ATST_LEQUAL = 3, - ATST_EQUAL = 4, - ATST_GEQUAL = 5, - ATST_GREATER = 6, - ATST_NOTEQUAL = 7, +enum GS_ATST { + ATST_NEVER = 0, + ATST_ALWAYS = 1, + ATST_LESS = 2, + ATST_LEQUAL = 3, + ATST_EQUAL = 4, + ATST_GEQUAL = 5, + ATST_GREATER = 6, + ATST_NOTEQUAL = 7, }; -enum GS_AFAIL -{ - AFAIL_KEEP = 0, - AFAIL_FB_ONLY = 1, - AFAIL_ZB_ONLY = 2, - AFAIL_RGB_ONLY = 3, +enum GS_AFAIL { + AFAIL_KEEP = 0, + AFAIL_FB_ONLY = 1, + AFAIL_ZB_ONLY = 2, + AFAIL_RGB_ONLY = 3, }; #define REG32(name) \ -union name \ -{ \ - u32 _u32; \ - struct { \ + union name \ + { \ + u32 _u32; \ + struct \ + { -#define REG64(name) \ -union name \ -{ \ - u64 _u64; \ - u32 _u32[2]; \ - /*void operator = (const GSVector4i& v) {GSVector4i::storel(this, v);} \ - bool operator == (const union name& r) const {return ((GSVector4i)r).eq(*this);} \ - bool operator != (const union name& r) const {return !((GSVector4i)r).eq(*this);} \ - operator GSVector4i() const {return GSVector4i::loadl(this);}*/ \ - struct { \ +#define REG64(name) \ + union name \ + { \ + u64 _u64; \ + u32 _u32[2]; \ + /*void operator = (const GSVector4i& v) {GSVector4i::storel(this, v);} \ + bool operator == (const union name& r) const {return ((GSVector4i)r).eq(*this);} \ + bool operator != (const union name& r) const {return !((GSVector4i)r).eq(*this);} \ + operator GSVector4i() const {return GSVector4i::loadl(this);}*/ \ + struct \ + { -#define REG128(name)\ -union name \ -{ \ - u64 _u64[2]; \ - u32 _u32[4]; \ - struct { \ +#define REG128(name) \ + union name \ + { \ + u64 _u64[2]; \ + u32 _u32[4]; \ + struct \ + { #define REG32_(prefix, name) REG32(prefix##name) #define REG64_(prefix, name) REG64(prefix##name) #define REG128_(prefix, name) REG128(prefix##name) -#define REG_END }; }; -#define REG_END2 }; +#define REG_END \ + } \ + ; \ + } \ + ; +#define REG_END2 \ + } \ + ; #define REG32_SET(name) \ -struct name \ -{ \ + struct name \ + { #define REG64_SET(name) \ -struct name \ -{ \ + struct name \ + { -#define REG128_SET(name)\ -struct name \ -{ \ +#define REG128_SET(name) \ + struct name \ + { -#define REG_SET_END }; +#define REG_SET_END \ + } \ + ; REG64_(GSReg, BGCOLOR) - u32 R:8; - u32 G:8; - u32 B:8; - u32 _PAD1:8; - u32 _PAD2:32; +u32 R : 8; +u32 G : 8; +u32 B : 8; +u32 _PAD1 : 8; +u32 _PAD2 : 32; REG_END REG64_(GSReg, BUSDIR) - u32 DIR:1; - u32 _PAD1:31; - u32 _PAD2:32; +u32 DIR : 1; +u32 _PAD1 : 31; +u32 _PAD2 : 32; REG_END REG64_(GSReg, CSR) - u32 rSIGNAL:1; - u32 rFINISH:1; - u32 rHSINT:1; - u32 rVSINT:1; - u32 rEDWINT:1; - u32 rZERO1:1; - u32 rZERO2:1; - u32 r_PAD1:1; - u32 rFLUSH:1; - u32 rRESET:1; - u32 r_PAD2:2; - u32 rNFIELD:1; - u32 rFIELD:1; - u32 rFIFO:2; - u32 rREV:8; - u32 rID:8; - u32 wSIGNAL:1; - u32 wFINISH:1; - u32 wHSINT:1; - u32 wVSINT:1; - u32 wEDWINT:1; - u32 wZERO1:1; - u32 wZERO2:1; - u32 w_PAD1:1; - u32 wFLUSH:1; - u32 wRESET:1; - u32 w_PAD2:2; - u32 wNFIELD:1; - u32 wFIELD:1; - u32 wFIFO:2; - u32 wREV:8; - u32 wID:8; +u32 rSIGNAL : 1; +u32 rFINISH : 1; +u32 rHSINT : 1; +u32 rVSINT : 1; +u32 rEDWINT : 1; +u32 rZERO1 : 1; +u32 rZERO2 : 1; +u32 r_PAD1 : 1; +u32 rFLUSH : 1; +u32 rRESET : 1; +u32 r_PAD2 : 2; +u32 rNFIELD : 1; +u32 rFIELD : 1; +u32 rFIFO : 2; +u32 rREV : 8; +u32 rID : 8; +u32 wSIGNAL : 1; +u32 wFINISH : 1; +u32 wHSINT : 1; +u32 wVSINT : 1; +u32 wEDWINT : 1; +u32 wZERO1 : 1; +u32 wZERO2 : 1; +u32 w_PAD1 : 1; +u32 wFLUSH : 1; +u32 wRESET : 1; +u32 w_PAD2 : 2; +u32 wNFIELD : 1; +u32 wFIELD : 1; +u32 wFIFO : 2; +u32 wREV : 8; +u32 wID : 8; REG_END -REG64_(GSReg, DISPFB) // (-1/2) - u32 FBP:9; - u32 FBW:6; - u32 PSM:5; - u32 _PAD:12; - u32 DBX:11; - u32 DBY:11; - u32 _PAD2:10; +REG64_(GSReg, DISPFB) // (-1/2) +u32 FBP : 9; +u32 FBW : 6; +u32 PSM : 5; +u32 _PAD : 12; +u32 DBX : 11; +u32 DBY : 11; +u32 _PAD2 : 10; REG_END2 - u32 Block() const {return FBP << 5;} +u32 Block() const { return FBP << 5; } REG_END2 -REG64_(GSReg, DISPLAY) // (-1/2) - u32 DX:12; - u32 DY:11; - u32 MAGH:4; - u32 MAGV:2; - u32 _PAD:3; - u32 DW:12; - u32 DH:11; - u32 _PAD2:9; +REG64_(GSReg, DISPLAY) // (-1/2) +u32 DX : 12; +u32 DY : 11; +u32 MAGH : 4; +u32 MAGV : 2; +u32 _PAD : 3; +u32 DW : 12; +u32 DH : 11; +u32 _PAD2 : 9; REG_END REG64_(GSReg, EXTBUF) - u32 EXBP:14; - u32 EXBW:6; - u32 FBIN:2; - u32 WFFMD:1; - u32 EMODA:2; - u32 EMODC:2; - u32 _PAD1:5; - u32 WDX:11; - u32 WDY:11; - u32 _PAD2:10; +u32 EXBP : 14; +u32 EXBW : 6; +u32 FBIN : 2; +u32 WFFMD : 1; +u32 EMODA : 2; +u32 EMODC : 2; +u32 _PAD1 : 5; +u32 WDX : 11; +u32 WDY : 11; +u32 _PAD2 : 10; REG_END REG64_(GSReg, EXTDATA) - u32 SX:12; - u32 SY:11; - u32 SMPH:4; - u32 SMPV:2; - u32 _PAD1:3; - u32 WW:12; - u32 WH:11; - u32 _PAD2:9; +u32 SX : 12; +u32 SY : 11; +u32 SMPH : 4; +u32 SMPV : 2; +u32 _PAD1 : 3; +u32 WW : 12; +u32 WH : 11; +u32 _PAD2 : 9; REG_END REG64_(GSReg, EXTWRITE) - u32 WRITE:1; - u32 _PAD1:31; - u32 _PAD2:32; +u32 WRITE : 1; +u32 _PAD1 : 31; +u32 _PAD2 : 32; REG_END REG64_(GSReg, IMR) - u32 _PAD1:8; - u32 SIGMSK:1; - u32 FINISHMSK:1; - u32 HSMSK:1; - u32 VSMSK:1; - u32 EDWMSK:1; - u32 _PAD2:19; - u32 _PAD3:32; +u32 _PAD1 : 8; +u32 SIGMSK : 1; +u32 FINISHMSK : 1; +u32 HSMSK : 1; +u32 VSMSK : 1; +u32 EDWMSK : 1; +u32 _PAD2 : 19; +u32 _PAD3 : 32; REG_END REG64_(GSReg, PMODE) union { - struct - { - u32 EN1:1; - u32 EN2:1; - u32 CRTMD:3; - u32 MMOD:1; - u32 AMOD:1; - u32 SLBG:1; - u32 ALP:8; - u32 _PAD:16; - u32 _PAD1:32; - }; + struct + { + u32 EN1 : 1; + u32 EN2 : 1; + u32 CRTMD : 3; + u32 MMOD : 1; + u32 AMOD : 1; + u32 SLBG : 1; + u32 ALP : 8; + u32 _PAD : 16; + u32 _PAD1 : 32; + }; - struct - { - u32 EN:2; - u32 _PAD2:30; - u32 _PAD3:32; - }; + struct + { + u32 EN : 2; + u32 _PAD2 : 30; + u32 _PAD3 : 32; + }; }; REG_END REG64_(GSReg, SIGLBLID) - u32 SIGID:32; - u32 LBLID:32; +u32 SIGID : 32; +u32 LBLID : 32; REG_END REG64_(GSReg, SMODE1) - u32 RC:3; - u32 LC:7; - u32 T1248:2; - u32 SLCK:1; - u32 CMOD:2; - u32 EX:1; - u32 PRST:1; - u32 SINT:1; - u32 XPCK:1; - u32 PCK2:2; - u32 SPML:4; - u32 GCONT:1; // YCrCb - u32 PHS:1; - u32 PVS:1; - u32 PEHS:1; - u32 PEVS:1; - u32 CLKSEL:2; - u32 NVCK:1; - u32 SLCK2:1; - u32 VCKSEL:2; - u32 VHP:1; - u32 _PAD1:27; +u32 RC : 3; +u32 LC : 7; +u32 T1248 : 2; +u32 SLCK : 1; +u32 CMOD : 2; +u32 EX : 1; +u32 PRST : 1; +u32 SINT : 1; +u32 XPCK : 1; +u32 PCK2 : 2; +u32 SPML : 4; +u32 GCONT : 1; // YCrCb +u32 PHS : 1; +u32 PVS : 1; +u32 PEHS : 1; +u32 PEVS : 1; +u32 CLKSEL : 2; +u32 NVCK : 1; +u32 SLCK2 : 1; +u32 VCKSEL : 2; +u32 VHP : 1; +u32 _PAD1 : 27; REG_END /* @@ -521,47 +521,47 @@ CLKSEL=1 CMOD=0 EX=0 GCONT=0 LC=32 NVCK=1 PCK2=0 PEHS=0 PEVS=0 PHS=0 PRST=1 PVS= */ REG64_(GSReg, SMODE2) - u32 INT:1; - u32 FFMD:1; - u32 DPMS:2; - u32 _PAD2:28; - u32 _PAD3:32; +u32 INT : 1; +u32 FFMD : 1; +u32 DPMS : 2; +u32 _PAD2 : 28; +u32 _PAD3 : 32; REG_END REG64_(GSReg, SRFSH) - u32 _DUMMY; - // TODO +u32 _DUMMY; +// TODO REG_END REG64_(GSReg, SYNCH1) - u32 _DUMMY; - // TODO +u32 _DUMMY; +// TODO REG_END REG64_(GSReg, SYNCH2) - u32 _DUMMY; - // TODO +u32 _DUMMY; +// TODO REG_END REG64_(GSReg, SYNCV) - u64 _DUMMY; - // TODO +u64 _DUMMY; +// TODO REG_END REG64_SET(GSReg) - GSRegBGCOLOR BGCOLOR; - GSRegBUSDIR BUSDIR; - GSRegCSR CSR; - GSRegDISPFB DISPFB; - GSRegDISPLAY DISPLAY; - GSRegEXTBUF EXTBUF; - GSRegEXTDATA EXTDATA; - GSRegEXTWRITE EXTWRITE; - GSRegIMR IMR; - GSRegPMODE PMODE; - GSRegSIGLBLID SIGLBLID; - GSRegSMODE1 SMODE1; - GSRegSMODE2 SMODE2; +GSRegBGCOLOR BGCOLOR; +GSRegBUSDIR BUSDIR; +GSRegCSR CSR; +GSRegDISPFB DISPFB; +GSRegDISPLAY DISPLAY; +GSRegEXTBUF EXTBUF; +GSRegEXTDATA EXTDATA; +GSRegEXTWRITE EXTWRITE; +GSRegIMR IMR; +GSRegPMODE PMODE; +GSRegSIGLBLID SIGLBLID; +GSRegSMODE1 SMODE1; +GSRegSMODE2 SMODE2; REG_SET_END // @@ -582,637 +582,637 @@ REG_END*/ // GIFReg REG64_(GIFReg, ALPHA) - u32 A:2; - u32 B:2; - u32 C:2; - u32 D:2; - u32 _PAD1:24; - u32 FIX:8; - u32 _PAD2:24; +u32 A : 2; +u32 B : 2; +u32 C : 2; +u32 D : 2; +u32 _PAD1 : 24; +u32 FIX : 8; +u32 _PAD2 : 24; REG_END2 - // opaque => output will be Cs/As - //__forceinline bool IsOpaque() const {return (A == B || C == 2 && FIX == 0) && D == 0 || (A == 0 && B == D && C == 2 && FIX == 0x80);} - //__forceinline bool IsOpaque(int amin, int amax) const {return (A == B || amax == 0) && D == 0 || A == 0 && B == D && amin == 0x80 && amax == 0x80;} +// opaque => output will be Cs/As +//__forceinline bool IsOpaque() const {return (A == B || C == 2 && FIX == 0) && D == 0 || (A == 0 && B == D && C == 2 && FIX == 0x80);} +//__forceinline bool IsOpaque(int amin, int amax) const {return (A == B || amax == 0) && D == 0 || A == 0 && B == D && amin == 0x80 && amax == 0x80;} REG_END2 REG64_(GIFReg, BITBLTBUF) - u32 SBP:14; - u32 _PAD1:2; - u32 SBW:6; - u32 _PAD2:2; - u32 SPSM:6; - u32 _PAD3:2; - u32 DBP:14; - u32 _PAD4:2; - u32 DBW:6; - u32 _PAD5:2; - u32 DPSM:6; - u32 _PAD6:2; +u32 SBP : 14; +u32 _PAD1 : 2; +u32 SBW : 6; +u32 _PAD2 : 2; +u32 SPSM : 6; +u32 _PAD3 : 2; +u32 DBP : 14; +u32 _PAD4 : 2; +u32 DBW : 6; +u32 _PAD5 : 2; +u32 DPSM : 6; +u32 _PAD6 : 2; REG_END REG64_(GIFReg, CLAMP) union { - struct - { - u32 WMS:2; - u32 WMT:2; - u32 MINU:10; - u32 MAXU:10; - u32 _PAD1:8; - u32 _PAD2:2; - u32 MAXV:10; - u32 _PAD3:20; - }; + struct + { + u32 WMS : 2; + u32 WMT : 2; + u32 MINU : 10; + u32 MAXU : 10; + u32 _PAD1 : 8; + u32 _PAD2 : 2; + u32 MAXV : 10; + u32 _PAD3 : 20; + }; - struct - { - u64 _PAD4:24; - u64 MINV:10; - u64 _PAD5:30; - }; + struct + { + u64 _PAD4 : 24; + u64 MINV : 10; + u64 _PAD5 : 30; + }; }; REG_END REG64_(GIFReg, COLCLAMP) - u32 CLAMP:1; - u32 _PAD1:31; - u32 _PAD2:32; +u32 CLAMP : 1; +u32 _PAD1 : 31; +u32 _PAD2 : 32; REG_END REG64_(GIFReg, DIMX) - s32 DM00:3; - s32 _PAD00:1; - s32 DM01:3; - s32 _PAD01:1; - s32 DM02:3; - s32 _PAD02:1; - s32 DM03:3; - s32 _PAD03:1; - s32 DM10:3; - s32 _PAD10:1; - s32 DM11:3; - s32 _PAD11:1; - s32 DM12:3; - s32 _PAD12:1; - s32 DM13:3; - s32 _PAD13:1; - s32 DM20:3; - s32 _PAD20:1; - s32 DM21:3; - s32 _PAD21:1; - s32 DM22:3; - s32 _PAD22:1; - s32 DM23:3; - s32 _PAD23:1; - s32 DM30:3; - s32 _PAD30:1; - s32 DM31:3; - s32 _PAD31:1; - s32 DM32:3; - s32 _PAD32:1; - s32 DM33:3; - s32 _PAD33:1; +s32 DM00 : 3; +s32 _PAD00 : 1; +s32 DM01 : 3; +s32 _PAD01 : 1; +s32 DM02 : 3; +s32 _PAD02 : 1; +s32 DM03 : 3; +s32 _PAD03 : 1; +s32 DM10 : 3; +s32 _PAD10 : 1; +s32 DM11 : 3; +s32 _PAD11 : 1; +s32 DM12 : 3; +s32 _PAD12 : 1; +s32 DM13 : 3; +s32 _PAD13 : 1; +s32 DM20 : 3; +s32 _PAD20 : 1; +s32 DM21 : 3; +s32 _PAD21 : 1; +s32 DM22 : 3; +s32 _PAD22 : 1; +s32 DM23 : 3; +s32 _PAD23 : 1; +s32 DM30 : 3; +s32 _PAD30 : 1; +s32 DM31 : 3; +s32 _PAD31 : 1; +s32 DM32 : 3; +s32 _PAD32 : 1; +s32 DM33 : 3; +s32 _PAD33 : 1; REG_END REG64_(GIFReg, DTHE) - u32 DTHE:1; - u32 _PAD1:31; - u32 _PAD2:32; +u32 DTHE : 1; +u32 _PAD1 : 31; +u32 _PAD2 : 32; REG_END REG64_(GIFReg, FBA) - u32 FBA:1; - u32 _PAD1:31; - u32 _PAD2:32; +u32 FBA : 1; +u32 _PAD1 : 31; +u32 _PAD2 : 32; REG_END REG64_(GIFReg, FINISH) - u32 _PAD1:32; - u32 _PAD2:32; +u32 _PAD1 : 32; +u32 _PAD2 : 32; REG_END REG64_(GIFReg, FOG) - u32 _PAD1:32; - u32 _PAD2:24; - u32 F:8; +u32 _PAD1 : 32; +u32 _PAD2 : 24; +u32 F : 8; REG_END REG64_(GIFReg, FOGCOL) - u32 FCR:8; - u32 FCG:8; - u32 FCB:8; - u32 _PAD1:8; - u32 _PAD2:32; +u32 FCR : 8; +u32 FCG : 8; +u32 FCB : 8; +u32 _PAD1 : 8; +u32 _PAD2 : 32; REG_END REG64_(GIFReg, FRAME) - u32 FBP:9; - u32 _PAD1:7; - u32 FBW:6; - u32 _PAD2:2; - u32 PSM:6; - u32 _PAD3:2; - u32 FBMSK:32; +u32 FBP : 9; +u32 _PAD1 : 7; +u32 FBW : 6; +u32 _PAD2 : 2; +u32 PSM : 6; +u32 _PAD3 : 2; +u32 FBMSK : 32; REG_END2 - u32 Block() const {return FBP << 5;} +u32 Block() const { return FBP << 5; } REG_END2 REG64_(GIFReg, HWREG) - u32 DATA_LOWER:32; - u32 DATA_UPPER:32; +u32 DATA_LOWER : 32; +u32 DATA_UPPER : 32; REG_END REG64_(GIFReg, LABEL) - u32 ID:32; - u32 IDMSK:32; +u32 ID : 32; +u32 IDMSK : 32; REG_END REG64_(GIFReg, MIPTBP1) - u64 TBP1:14; - u64 TBW1:6; - u64 TBP2:14; - u64 TBW2:6; - u64 TBP3:14; - u64 TBW3:6; - u64 _PAD:4; +u64 TBP1 : 14; +u64 TBW1 : 6; +u64 TBP2 : 14; +u64 TBW2 : 6; +u64 TBP3 : 14; +u64 TBW3 : 6; +u64 _PAD : 4; REG_END REG64_(GIFReg, MIPTBP2) - u64 TBP4:14; - u64 TBW4:6; - u64 TBP5:14; - u64 TBW5:6; - u64 TBP6:14; - u64 TBW6:6; - u64 _PAD:4; +u64 TBP4 : 14; +u64 TBW4 : 6; +u64 TBP5 : 14; +u64 TBW5 : 6; +u64 TBP6 : 14; +u64 TBW6 : 6; +u64 _PAD : 4; REG_END REG64_(GIFReg, NOP) - u32 _PAD1:32; - u32 _PAD2:32; +u32 _PAD1 : 32; +u32 _PAD2 : 32; REG_END REG64_(GIFReg, PABE) - u32 PABE:1; - u32 _PAD1:31; - u32 _PAD2:32; +u32 PABE : 1; +u32 _PAD1 : 31; +u32 _PAD2 : 32; REG_END REG64_(GIFReg, PRIM) - u32 PRIM:3; - u32 IIP:1; - u32 TME:1; - u32 FGE:1; - u32 ABE:1; - u32 AA1:1; - u32 FST:1; - u32 CTXT:1; - u32 FIX:1; - u32 _PAD1:21; - u32 _PAD2:32; +u32 PRIM : 3; +u32 IIP : 1; +u32 TME : 1; +u32 FGE : 1; +u32 ABE : 1; +u32 AA1 : 1; +u32 FST : 1; +u32 CTXT : 1; +u32 FIX : 1; +u32 _PAD1 : 21; +u32 _PAD2 : 32; REG_END REG64_(GIFReg, PRMODE) - u32 _PRIM:3; - u32 IIP:1; - u32 TME:1; - u32 FGE:1; - u32 ABE:1; - u32 AA1:1; - u32 FST:1; - u32 CTXT:1; - u32 FIX:1; - u32 _PAD2:21; - u32 _PAD3:32; +u32 _PRIM : 3; +u32 IIP : 1; +u32 TME : 1; +u32 FGE : 1; +u32 ABE : 1; +u32 AA1 : 1; +u32 FST : 1; +u32 CTXT : 1; +u32 FIX : 1; +u32 _PAD2 : 21; +u32 _PAD3 : 32; REG_END REG64_(GIFReg, PRMODECONT) - u32 AC:1; - u32 _PAD1:31; - u32 _PAD2:32; +u32 AC : 1; +u32 _PAD1 : 31; +u32 _PAD2 : 32; REG_END REG64_(GIFReg, RGBAQ) - u32 R:8; - u32 G:8; - u32 B:8; - u32 A:8; - float Q; +u32 R : 8; +u32 G : 8; +u32 B : 8; +u32 A : 8; +float Q; REG_END REG64_(GIFReg, SCANMSK) - u32 MSK:2; - u32 _PAD1:30; - u32 _PAD2:32; +u32 MSK : 2; +u32 _PAD1 : 30; +u32 _PAD2 : 32; REG_END REG64_(GIFReg, SCISSOR) - u32 SCAX0:11; - u32 _PAD1:5; - u32 SCAX1:11; - u32 _PAD2:5; - u32 SCAY0:11; - u32 _PAD3:5; - u32 SCAY1:11; - u32 _PAD4:5; +u32 SCAX0 : 11; +u32 _PAD1 : 5; +u32 SCAX1 : 11; +u32 _PAD2 : 5; +u32 SCAY0 : 11; +u32 _PAD3 : 5; +u32 SCAY1 : 11; +u32 _PAD4 : 5; REG_END REG64_(GIFReg, SIGNAL) - u32 ID:32; - u32 IDMSK:32; +u32 ID : 32; +u32 IDMSK : 32; REG_END REG64_(GIFReg, ST) - float S; - float T; +float S; +float T; REG_END REG64_(GIFReg, TEST) - u32 ATE:1; - u32 ATST:3; - u32 AREF:8; - u32 AFAIL:2; - u32 DATE:1; - u32 DATM:1; - u32 ZTE:1; - u32 ZTST:2; - u32 _PAD1:13; - u32 _PAD2:32; +u32 ATE : 1; +u32 ATST : 3; +u32 AREF : 8; +u32 AFAIL : 2; +u32 DATE : 1; +u32 DATM : 1; +u32 ZTE : 1; +u32 ZTST : 2; +u32 _PAD1 : 13; +u32 _PAD2 : 32; REG_END2 - __forceinline bool DoFirstPass() {return !ATE || ATST != ATST_NEVER;} // not all pixels fail automatically - __forceinline bool DoSecondPass() {return ATE && ATST != ATST_ALWAYS && AFAIL != AFAIL_KEEP;} // pixels may fail, write fb/z - __forceinline bool NoSecondPass() {return ATE && ATST != ATST_ALWAYS && AFAIL == AFAIL_KEEP;} // pixels may fail, no output +__forceinline bool DoFirstPass() { return !ATE || ATST != ATST_NEVER; } // not all pixels fail automatically +__forceinline bool DoSecondPass() { return ATE && ATST != ATST_ALWAYS && AFAIL != AFAIL_KEEP; } // pixels may fail, write fb/z +__forceinline bool NoSecondPass() { return ATE && ATST != ATST_ALWAYS && AFAIL == AFAIL_KEEP; } // pixels may fail, no output REG_END2 REG64_(GIFReg, TEX0) union { - struct - { - u32 TBP0:14; - u32 TBW:6; - u32 PSM:6; - u32 TW:4; - u32 _PAD1:2; - u32 _PAD2:2; - u32 TCC:1; - u32 TFX:2; - u32 CBP:14; - u32 CPSM:4; - u32 CSM:1; - u32 CSA:5; - u32 CLD:3; - }; + struct + { + u32 TBP0 : 14; + u32 TBW : 6; + u32 PSM : 6; + u32 TW : 4; + u32 _PAD1 : 2; + u32 _PAD2 : 2; + u32 TCC : 1; + u32 TFX : 2; + u32 CBP : 14; + u32 CPSM : 4; + u32 CSM : 1; + u32 CSA : 5; + u32 CLD : 3; + }; - struct - { - u64 _PAD3:30; - u64 TH:4; - u64 _PAD4:30; - }; + struct + { + u64 _PAD3 : 30; + u64 TH : 4; + u64 _PAD4 : 30; + }; }; REG_END2 - //__forceinline bool IsRepeating() {return ((u32)1 << TW) > (TBW << 6);} +//__forceinline bool IsRepeating() {return ((u32)1 << TW) > (TBW << 6);} REG_END2 REG64_(GIFReg, TEX1) - u32 LCM:1; - u32 _PAD1:1; - u32 MXL:3; - u32 MMAG:1; - u32 MMIN:3; - u32 MTBA:1; - u32 _PAD2:9; - u32 L:2; - u32 _PAD3:11; - s32 K:12; // 1:7:4 - u32 _PAD4:20; +u32 LCM : 1; +u32 _PAD1 : 1; +u32 MXL : 3; +u32 MMAG : 1; +u32 MMIN : 3; +u32 MTBA : 1; +u32 _PAD2 : 9; +u32 L : 2; +u32 _PAD3 : 11; +s32 K : 12; // 1:7:4 +u32 _PAD4 : 20; REG_END2 - bool IsMinLinear() const {return (MMIN == 1) || (MMIN & 4);} - bool IsMagLinear() const {return MMAG;} +bool IsMinLinear() const { return (MMIN == 1) || (MMIN & 4); } +bool IsMagLinear() const { return MMAG; } REG_END2 REG64_(GIFReg, TEX2) - u32 _PAD1:20; - u32 PSM:6; - u32 _PAD2:6; - u32 _PAD3:5; - u32 CBP:14; - u32 CPSM:4; - u32 CSM:1; - u32 CSA:5; - u32 CLD:3; +u32 _PAD1 : 20; +u32 PSM : 6; +u32 _PAD2 : 6; +u32 _PAD3 : 5; +u32 CBP : 14; +u32 CPSM : 4; +u32 CSM : 1; +u32 CSA : 5; +u32 CLD : 3; REG_END REG64_(GIFReg, TEXA) - u32 TA0:8; - u32 _PAD1:7; - u32 AEM:1; - u32 _PAD2:16; - u32 TA1:8; - u32 _PAD3:24; +u32 TA0 : 8; +u32 _PAD1 : 7; +u32 AEM : 1; +u32 _PAD2 : 16; +u32 TA1 : 8; +u32 _PAD3 : 24; REG_END REG64_(GIFReg, TEXCLUT) - u32 CBW:6; - u32 COU:6; - u32 COV:10; - u32 _PAD1:10; - u32 _PAD2:32; +u32 CBW : 6; +u32 COU : 6; +u32 COV : 10; +u32 _PAD1 : 10; +u32 _PAD2 : 32; REG_END REG64_(GIFReg, TEXFLUSH) - u32 _PAD1:32; - u32 _PAD2:32; +u32 _PAD1 : 32; +u32 _PAD2 : 32; REG_END REG64_(GIFReg, TRXDIR) - u32 XDIR:2; - u32 _PAD1:30; - u32 _PAD2:32; +u32 XDIR : 2; +u32 _PAD1 : 30; +u32 _PAD2 : 32; REG_END REG64_(GIFReg, TRXPOS) - u32 SSAX:11; - u32 _PAD1:5; - u32 SSAY:11; - u32 _PAD2:5; - u32 DSAX:11; - u32 _PAD3:5; - u32 DSAY:11; - u32 DIRY:1; - u32 DIRX:1; - u32 _PAD4:3; +u32 SSAX : 11; +u32 _PAD1 : 5; +u32 SSAY : 11; +u32 _PAD2 : 5; +u32 DSAX : 11; +u32 _PAD3 : 5; +u32 DSAY : 11; +u32 DIRY : 1; +u32 DIRX : 1; +u32 _PAD4 : 3; REG_END REG64_(GIFReg, TRXREG) - u32 RRW:12; - u32 _PAD1:20; - u32 RRH:12; - u32 _PAD2:20; +u32 RRW : 12; +u32 _PAD1 : 20; +u32 RRH : 12; +u32 _PAD2 : 20; REG_END // GSState::GIFPackedRegHandlerUV and GSState::GIFRegHandlerUV will make sure that the _PAD1/2 bits are set to zero REG64_(GIFReg, UV) - u32 U:16; +u32 U : 16; // u32 _PAD1:2; - u32 V:16; +u32 V : 16; // u32 _PAD2:2; - u32 _PAD3:32; +u32 _PAD3 : 32; REG_END // GSState::GIFRegHandlerXYOFFSET will make sure that the _PAD1/2 bits are set to zero REG64_(GIFReg, XYOFFSET) - u32 OFX; // :16; u32 _PAD1:16; - u32 OFY; // :16; u32 _PAD2:16; +u32 OFX; // :16; u32 _PAD1:16; +u32 OFY; // :16; u32 _PAD2:16; REG_END REG64_(GIFReg, XYZ) - u32 X:16; - u32 Y:16; - u32 Z:32; +u32 X : 16; +u32 Y : 16; +u32 Z : 32; REG_END REG64_(GIFReg, XYZF) - u32 X:16; - u32 Y:16; - u32 Z:24; - u32 F:8; +u32 X : 16; +u32 Y : 16; +u32 Z : 24; +u32 F : 8; REG_END REG64_(GIFReg, ZBUF) - u32 ZBP:9; - u32 _PAD1:15; - // u32 PSM:4; - // u32 _PAD2:4; - u32 PSM:6; - u32 _PAD2:2; - u32 ZMSK:1; - u32 _PAD3:31; +u32 ZBP : 9; +u32 _PAD1 : 15; +// u32 PSM:4; +// u32 _PAD2:4; +u32 PSM : 6; +u32 _PAD2 : 2; +u32 ZMSK : 1; +u32 _PAD3 : 31; REG_END2 - u32 Block() const {return ZBP << 5;} +u32 Block() const { return ZBP << 5; } REG_END2 REG64_SET(GIFReg) - GIFRegALPHA ALPHA; - GIFRegBITBLTBUF BITBLTBUF; - GIFRegCLAMP CLAMP; - GIFRegCOLCLAMP COLCLAMP; - GIFRegDIMX DIMX; - GIFRegDTHE DTHE; - GIFRegFBA FBA; - GIFRegFINISH FINISH; - GIFRegFOG FOG; - GIFRegFOGCOL FOGCOL; - GIFRegFRAME FRAME; - GIFRegHWREG HWREG; - GIFRegLABEL LABEL; - GIFRegMIPTBP1 MIPTBP1; - GIFRegMIPTBP2 MIPTBP2; - GIFRegNOP NOP; - GIFRegPABE PABE; - GIFRegPRIM PRIM; - GIFRegPRMODE PRMODE; - GIFRegPRMODECONT PRMODECONT; - GIFRegRGBAQ RGBAQ; - GIFRegSCANMSK SCANMSK; - GIFRegSCISSOR SCISSOR; - GIFRegSIGNAL SIGNAL; - GIFRegST ST; - GIFRegTEST TEST; - GIFRegTEX0 TEX0; - GIFRegTEX1 TEX1; - GIFRegTEX2 TEX2; - GIFRegTEXA TEXA; - GIFRegTEXCLUT TEXCLUT; - GIFRegTEXFLUSH TEXFLUSH; - GIFRegTRXDIR TRXDIR; - GIFRegTRXPOS TRXPOS; - GIFRegTRXREG TRXREG; - GIFRegUV UV; - GIFRegXYOFFSET XYOFFSET; - GIFRegXYZ XYZ; - GIFRegXYZF XYZF; - GIFRegZBUF ZBUF; +GIFRegALPHA ALPHA; +GIFRegBITBLTBUF BITBLTBUF; +GIFRegCLAMP CLAMP; +GIFRegCOLCLAMP COLCLAMP; +GIFRegDIMX DIMX; +GIFRegDTHE DTHE; +GIFRegFBA FBA; +GIFRegFINISH FINISH; +GIFRegFOG FOG; +GIFRegFOGCOL FOGCOL; +GIFRegFRAME FRAME; +GIFRegHWREG HWREG; +GIFRegLABEL LABEL; +GIFRegMIPTBP1 MIPTBP1; +GIFRegMIPTBP2 MIPTBP2; +GIFRegNOP NOP; +GIFRegPABE PABE; +GIFRegPRIM PRIM; +GIFRegPRMODE PRMODE; +GIFRegPRMODECONT PRMODECONT; +GIFRegRGBAQ RGBAQ; +GIFRegSCANMSK SCANMSK; +GIFRegSCISSOR SCISSOR; +GIFRegSIGNAL SIGNAL; +GIFRegST ST; +GIFRegTEST TEST; +GIFRegTEX0 TEX0; +GIFRegTEX1 TEX1; +GIFRegTEX2 TEX2; +GIFRegTEXA TEXA; +GIFRegTEXCLUT TEXCLUT; +GIFRegTEXFLUSH TEXFLUSH; +GIFRegTRXDIR TRXDIR; +GIFRegTRXPOS TRXPOS; +GIFRegTRXREG TRXREG; +GIFRegUV UV; +GIFRegXYOFFSET XYOFFSET; +GIFRegXYZ XYZ; +GIFRegXYZF XYZF; +GIFRegZBUF ZBUF; REG_SET_END REG64_SET(GIFCTXTReg) - GIFRegTEX0 TEX0; - GIFRegCLAMP CLAMP; - GIFRegTEX1 TEX1; - GIFRegTEX2 TEX2; - GIFRegXYOFFSET XYOFFSET; - GIFRegMIPTBP1 MIPTBP1; - GIFRegMIPTBP2 MIPTBP2; - GIFRegSCISSOR SCISSOR; - GIFRegALPHA ALPHA; - GIFRegTEST TEST; - GIFRegFBA FBA; - GIFRegFRAME FRAME; - GIFRegZBUF ZBUF; +GIFRegTEX0 TEX0; +GIFRegCLAMP CLAMP; +GIFRegTEX1 TEX1; +GIFRegTEX2 TEX2; +GIFRegXYOFFSET XYOFFSET; +GIFRegMIPTBP1 MIPTBP1; +GIFRegMIPTBP2 MIPTBP2; +GIFRegSCISSOR SCISSOR; +GIFRegALPHA ALPHA; +GIFRegTEST TEST; +GIFRegFBA FBA; +GIFRegFRAME FRAME; +GIFRegZBUF ZBUF; REG_SET_END // GIFPacked REG128_(GIFPacked, PRIM) - u32 PRIM:11; - u32 _PAD1:21; - u32 _PAD2:32; - u32 _PAD3:32; - u32 _PAD4:32; +u32 PRIM : 11; +u32 _PAD1 : 21; +u32 _PAD2 : 32; +u32 _PAD3 : 32; +u32 _PAD4 : 32; REG_END REG128_(GIFPacked, RGBA) - u32 R:8; - u32 _PAD1:24; - u32 G:8; - u32 _PAD2:24; - u32 B:8; - u32 _PAD3:24; - u32 A:8; - u32 _PAD4:24; +u32 R : 8; +u32 _PAD1 : 24; +u32 G : 8; +u32 _PAD2 : 24; +u32 B : 8; +u32 _PAD3 : 24; +u32 A : 8; +u32 _PAD4 : 24; REG_END REG128_(GIFPacked, STQ) - float S; - float T; - float Q; - u32 _PAD1:32; +float S; +float T; +float Q; +u32 _PAD1 : 32; REG_END REG128_(GIFPacked, UV) - u32 U:14; - u32 _PAD1:18; - u32 V:14; - u32 _PAD2:18; - u32 _PAD3:32; - u32 _PAD4:32; +u32 U : 14; +u32 _PAD1 : 18; +u32 V : 14; +u32 _PAD2 : 18; +u32 _PAD3 : 32; +u32 _PAD4 : 32; REG_END REG128_(GIFPacked, XYZF2) - u32 X:16; - u32 _PAD1:16; - u32 Y:16; - u32 _PAD2:16; - u32 _PAD3:4; - u32 Z:24; - u32 _PAD4:4; - u32 _PAD5:4; - u32 F:8; - u32 _PAD6:3; - u32 ADC:1; - u32 _PAD7:16; +u32 X : 16; +u32 _PAD1 : 16; +u32 Y : 16; +u32 _PAD2 : 16; +u32 _PAD3 : 4; +u32 Z : 24; +u32 _PAD4 : 4; +u32 _PAD5 : 4; +u32 F : 8; +u32 _PAD6 : 3; +u32 ADC : 1; +u32 _PAD7 : 16; REG_END REG128_(GIFPacked, XYZ2) - u32 X:16; - u32 _PAD1:16; - u32 Y:16; - u32 _PAD2:16; - u32 Z:32; - u32 _PAD3:15; - u32 ADC:1; - u32 _PAD4:16; +u32 X : 16; +u32 _PAD1 : 16; +u32 Y : 16; +u32 _PAD2 : 16; +u32 Z : 32; +u32 _PAD3 : 15; +u32 ADC : 1; +u32 _PAD4 : 16; REG_END REG128_(GIFPacked, FOG) - u32 _PAD1:32; - u32 _PAD2:32; - u32 _PAD3:32; - u32 _PAD4:4; - u32 F:8; - u32 _PAD5:20; +u32 _PAD1 : 32; +u32 _PAD2 : 32; +u32 _PAD3 : 32; +u32 _PAD4 : 4; +u32 F : 8; +u32 _PAD5 : 20; REG_END REG128_(GIFPacked, A_D) - u64 DATA:64; - u32 ADDR:8; // enum GIF_A_D_REG - u32 _PAD1:24; - u32 _PAD2:32; +u64 DATA : 64; +u32 ADDR : 8; // enum GIF_A_D_REG +u32 _PAD1 : 24; +u32 _PAD2 : 32; REG_END REG128_(GIFPacked, NOP) - u32 _PAD1:32; - u32 _PAD2:32; - u32 _PAD3:32; - u32 _PAD4:32; +u32 _PAD1 : 32; +u32 _PAD2 : 32; +u32 _PAD3 : 32; +u32 _PAD4 : 32; REG_END REG128_SET(GIFPackedReg) - GIFReg r; - GIFPackedPRIM PRIM; - GIFPackedRGBA RGBA; - GIFPackedSTQ STQ; - GIFPackedUV UV; - GIFPackedXYZF2 XYZF2; - GIFPackedXYZ2 XYZ2; - GIFPackedFOG FOG; - GIFPackedA_D A_D; - GIFPackedNOP NOP; +GIFReg r; +GIFPackedPRIM PRIM; +GIFPackedRGBA RGBA; +GIFPackedSTQ STQ; +GIFPackedUV UV; +GIFPackedXYZF2 XYZF2; +GIFPackedXYZ2 XYZ2; +GIFPackedFOG FOG; +GIFPackedA_D A_D; +GIFPackedNOP NOP; REG_SET_END struct GSPrivRegSet { - union - { - struct - { - GSRegPMODE PMODE; - u64 _pad1; - GSRegSMODE1 SMODE1; - u64 _pad2; - GSRegSMODE2 SMODE2; - u64 _pad3; - GSRegSRFSH SRFSH; - u64 _pad4; - GSRegSYNCH1 SYNCH1; - u64 _pad5; - GSRegSYNCH2 SYNCH2; - u64 _pad6; - GSRegSYNCV SYNCV; - u64 _pad7; - struct { - GSRegDISPFB DISPFB; - u64 _pad1; - GSRegDISPLAY DISPLAY; - u64 _pad2; - } DISP[2]; - GSRegEXTBUF EXTBUF; - u64 _pad8; - GSRegEXTDATA EXTDATA; - u64 _pad9; - GSRegEXTWRITE EXTWRITE; - u64 _pad10; - GSRegBGCOLOR BGCOLOR; - u64 _pad11; - }; + union + { + struct + { + GSRegPMODE PMODE; + u64 _pad1; + GSRegSMODE1 SMODE1; + u64 _pad2; + GSRegSMODE2 SMODE2; + u64 _pad3; + GSRegSRFSH SRFSH; + u64 _pad4; + GSRegSYNCH1 SYNCH1; + u64 _pad5; + GSRegSYNCH2 SYNCH2; + u64 _pad6; + GSRegSYNCV SYNCV; + u64 _pad7; + struct + { + GSRegDISPFB DISPFB; + u64 _pad1; + GSRegDISPLAY DISPLAY; + u64 _pad2; + } DISP[2]; + GSRegEXTBUF EXTBUF; + u64 _pad8; + GSRegEXTDATA EXTDATA; + u64 _pad9; + GSRegEXTWRITE EXTWRITE; + u64 _pad10; + GSRegBGCOLOR BGCOLOR; + u64 _pad11; + }; - u8 _pad12[0x1000]; - }; + u8 _pad12[0x1000]; + }; - union - { - struct - { - GSRegCSR CSR; - u64 _pad13; - GSRegIMR IMR; - u64 _pad14; - u64 _unk1[4]; - GSRegBUSDIR BUSDIR; - u64 _pad15; - u64 _unk2[6]; - GSRegSIGLBLID SIGLBLID; - u64 _pad16; - }; + union + { + struct + { + GSRegCSR CSR; + u64 _pad13; + GSRegIMR IMR; + u64 _pad14; + u64 _unk1[4]; + GSRegBUSDIR BUSDIR; + u64 _pad15; + u64 _unk2[6]; + GSRegSIGLBLID SIGLBLID; + u64 _pad16; + }; - u8 _pad17[0x1000]; - }; + u8 _pad17[0x1000]; + }; }; #pragma pack(pop) #endif - diff --git a/plugins/GSnull/Windows/Config.cpp b/plugins/GSnull/Windows/Config.cpp index 110e23e485..c021c4c1f3 100644 --- a/plugins/GSnull/Windows/Config.cpp +++ b/plugins/GSnull/Windows/Config.cpp @@ -21,49 +21,47 @@ extern HINSTANCE hInst; void SaveConfig() { - Config *Conf1 = &conf; - char *szTemp; - char szIniFile[256], szValue[256]; + Config* Conf1 = &conf; + char* szTemp; + char szIniFile[256], szValue[256]; - GetModuleFileName(GetModuleHandle((LPCSTR)hInst), szIniFile, 256); - szTemp = strrchr(szIniFile, '\\'); - - if(!szTemp) return; - strcpy(szTemp, "\\inis\\gsnull.ini"); - sprintf(szValue,"%u",Conf1->Log); - WritePrivateProfileString("Interface", "Logging",szValue,szIniFile); + GetModuleFileName(GetModuleHandle((LPCSTR)hInst), szIniFile, 256); + szTemp = strrchr(szIniFile, '\\'); + if (!szTemp) + return; + strcpy(szTemp, "\\inis\\gsnull.ini"); + sprintf(szValue, "%u", Conf1->Log); + WritePrivateProfileString("Interface", "Logging", szValue, szIniFile); } -void LoadConfig() +void LoadConfig() { - FILE *fp; + FILE* fp; - Config *Conf1 = &conf; - char *szTemp; - char szIniFile[256], szValue[256]; + Config* Conf1 = &conf; + char* szTemp; + char szIniFile[256], szValue[256]; - GetModuleFileName(GetModuleHandle((LPCSTR)hInst), szIniFile, 256); - szTemp = strrchr(szIniFile, '\\'); + GetModuleFileName(GetModuleHandle((LPCSTR)hInst), szIniFile, 256); + szTemp = strrchr(szIniFile, '\\'); - if(!szTemp) return ; - strcpy(szTemp, "\\inis\\gsnull.ini"); - fp=fopen("inis\\gsnull.ini","rt");//check if gsnull.ini really exists - - if (!fp) - { - CreateDirectory("inis",NULL); + if (!szTemp) + return; + strcpy(szTemp, "\\inis\\gsnull.ini"); + fp = fopen("inis\\gsnull.ini", "rt"); //check if gsnull.ini really exists + + if (!fp) { + CreateDirectory("inis", NULL); memset(&conf, 0, sizeof(conf)); - conf.Log = 0;//default value - SaveConfig();//save and return - return ; - } - - fclose(fp); - GetPrivateProfileString("Interface", "Logging", NULL, szValue, 20, szIniFile); - Conf1->Log = strtoul(szValue, NULL, 10); - return ; + conf.Log = 0; //default value + SaveConfig(); //save and return + return; + } + fclose(fp); + GetPrivateProfileString("Interface", "Logging", NULL, szValue, 20, szIniFile); + Conf1->Log = strtoul(szValue, NULL, 10); + return; } - diff --git a/plugins/GSnull/Windows/GSwin.cpp b/plugins/GSnull/Windows/GSwin.cpp index 508ba40347..ccf2eebd44 100644 --- a/plugins/GSnull/Windows/GSwin.cpp +++ b/plugins/GSnull/Windows/GSwin.cpp @@ -20,44 +20,43 @@ HWND GShwnd = NULL; LRESULT CALLBACK MsgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - switch(msg) - { + switch (msg) { case WM_CLOSE: DestroyWindow(hwnd); - break; + break; case WM_DESTROY: PostQuitMessage(0); - break; + break; default: return DefWindowProc(hwnd, msg, wParam, lParam); } return 0; } -int GSOpenWindow(void *pDsp, const char *Title) +int GSOpenWindow(void* pDsp, const char* Title) { - WNDCLASSEX wc = { sizeof(WNDCLASSEX), CS_CLASSDC, MsgProc, 0L, 0L, - GetModuleHandle(NULL), NULL, NULL, NULL, NULL, - "PS2EMU_GSNULL", NULL }; - RegisterClassEx( &wc ); + WNDCLASSEX wc = {sizeof(WNDCLASSEX), CS_CLASSDC, MsgProc, 0L, 0L, + GetModuleHandle(NULL), NULL, NULL, NULL, NULL, + "PS2EMU_GSNULL", NULL}; + RegisterClassEx(&wc); - GShwnd = CreateWindowEx( WS_EX_CLIENTEDGE, "PS2EMU_GSNULL", Title, - WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 240, 120, NULL, NULL, wc.hInstance, NULL); + GShwnd = CreateWindowEx(WS_EX_CLIENTEDGE, "PS2EMU_GSNULL", Title, + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 240, 120, NULL, NULL, wc.hInstance, NULL); - if(GShwnd == NULL) - { - GSLog::WriteLn("Failed to create window. Exiting..."); - return -1; - } + if (GShwnd == NULL) { + GSLog::WriteLn("Failed to create window. Exiting..."); + return -1; + } - if( pDsp != NULL ) *(uptr*)pDsp = (uptr)GShwnd; + if (pDsp != NULL) + *(uptr*)pDsp = (uptr)GShwnd; - return 0; + return 0; } void GSCloseWindow() { - DestroyWindow( GShwnd ); + DestroyWindow(GShwnd); } void GSProcessMessages() @@ -65,6 +64,6 @@ void GSProcessMessages() } // GSkeyEvent gets called when there is a keyEvent from the PAD plugin -void HandleKeyEvent(keyEvent *ev) +void HandleKeyEvent(keyEvent* ev) { } diff --git a/plugins/GSnull/Windows/GSwin.h b/plugins/GSnull/Windows/GSwin.h index 723867158a..d39d86113f 100644 --- a/plugins/GSnull/Windows/GSwin.h +++ b/plugins/GSnull/Windows/GSwin.h @@ -18,8 +18,7 @@ #include #include -extern int GSOpenWindow(void *pDsp, const char *Title); +extern int GSOpenWindow(void* pDsp, const char* Title); extern void GSCloseWindow(); extern void GSProcessMessages(); -extern void HandleKeyEvent(keyEvent *ev); - +extern void HandleKeyEvent(keyEvent* ev); diff --git a/plugins/GSnull/Windows/Win32.cpp b/plugins/GSnull/Windows/Win32.cpp index 6ebdda304a..32d61bb9ed 100644 --- a/plugins/GSnull/Windows/Win32.cpp +++ b/plugins/GSnull/Windows/Win32.cpp @@ -24,74 +24,83 @@ HINSTANCE hInst; extern HWND GShwnd; -void SysMessage(char *fmt, ...) { - va_list list; - char tmp[512]; +void SysMessage(char* fmt, ...) +{ + va_list list; + char tmp[512]; - va_start(list,fmt); - vsprintf(tmp,fmt,list); - va_end(list); - MessageBox((GShwnd!=NULL) ? GShwnd : GetActiveWindow(), tmp, "GS Plugin Msg", 0); + va_start(list, fmt); + vsprintf(tmp, fmt, list); + va_end(list); + MessageBox((GShwnd != NULL) ? GShwnd : GetActiveWindow(), tmp, "GS Plugin Msg", 0); } -BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) { +BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ - switch(uMsg) { - case WM_INITDIALOG: - LoadConfig(); - if (conf.Log) CheckDlgButton(hW, IDC_LOGGING, TRUE); - return TRUE; + switch (uMsg) { + case WM_INITDIALOG: + LoadConfig(); + if (conf.Log) + CheckDlgButton(hW, IDC_LOGGING, TRUE); + return TRUE; - case WM_COMMAND: - switch(LOWORD(wParam)) { - case IDCANCEL: - EndDialog(hW, TRUE); - return TRUE; - case IDOK: - if (IsDlgButtonChecked(hW, IDC_LOGGING)) - conf.Log = 1; - else conf.Log = 0; - SaveConfig(); - EndDialog(hW, FALSE); - return TRUE; - } - } - return FALSE; + case WM_COMMAND: + switch (LOWORD(wParam)) { + case IDCANCEL: + EndDialog(hW, TRUE); + return TRUE; + case IDOK: + if (IsDlgButtonChecked(hW, IDC_LOGGING)) + conf.Log = 1; + else + conf.Log = 0; + SaveConfig(); + EndDialog(hW, FALSE); + return TRUE; + } + } + return FALSE; } -BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) { - switch(uMsg) { - case WM_INITDIALOG: - return TRUE; +BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) { + case WM_INITDIALOG: + return TRUE; - case WM_COMMAND: - switch(LOWORD(wParam)) { - case IDOK: - EndDialog(hW, FALSE); - return TRUE; - } - } - return FALSE; + case WM_COMMAND: + switch (LOWORD(wParam)) { + case IDOK: + EndDialog(hW, FALSE); + return TRUE; + } + } + return FALSE; } -EXPORT_C_(void) GSconfigure() { +EXPORT_C_(void) +GSconfigure() +{ DialogBox(hInst, MAKEINTRESOURCE(IDD_CONFIG), GetActiveWindow(), (DLGPROC)ConfigureDlgProc); } -EXPORT_C_(void) GSabout() { +EXPORT_C_(void) +GSabout() +{ DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUT), GetActiveWindow(), (DLGPROC)AboutDlgProc); } -BOOL APIENTRY DllMain(HANDLE hModule, // DLL INIT - DWORD dwReason, - LPVOID lpReserved) { - hInst = (HINSTANCE)hModule; - return TRUE; // very quick :) +BOOL APIENTRY DllMain(HANDLE hModule, // DLL INIT + DWORD dwReason, + LPVOID lpReserved) +{ + hInst = (HINSTANCE)hModule; + return TRUE; // very quick :) } - diff --git a/plugins/GSnull/null/GSnull.cpp b/plugins/GSnull/null/GSnull.cpp index bb7649a681..8c62bbcabe 100644 --- a/plugins/GSnull/null/GSnull.cpp +++ b/plugins/GSnull/null/GSnull.cpp @@ -17,20 +17,20 @@ void OnKeyboardF5(int myShift) { - GSLog::WriteLn("F5 pressed!"); + GSLog::WriteLn("F5 pressed!"); } void OnKeyboardF6(int myShift) { - GSLog::WriteLn("F6 pressed!"); + GSLog::WriteLn("F6 pressed!"); } void OnKeyboardF7(int myShift) { - GSLog::WriteLn("F7 pressed!"); + GSLog::WriteLn("F7 pressed!"); } void OnKeyboardF9(int myShift) { - GSLog::WriteLn("F9 pressed!"); + GSLog::WriteLn("F9 pressed!"); }