diff --git a/pcsx2-codeblocks.workspace b/pcsx2-codeblocks.workspace index b4fcb19e51..16d92eb170 100644 --- a/pcsx2-codeblocks.workspace +++ b/pcsx2-codeblocks.workspace @@ -30,5 +30,6 @@ + diff --git a/plugins/zzogl-pg/opengl/GSmain.cpp b/plugins/zzogl-pg/opengl/GSmain.cpp index b511b613df..4f1c0a5a8f 100644 --- a/plugins/zzogl-pg/opengl/GSmain.cpp +++ b/plugins/zzogl-pg/opengl/GSmain.cpp @@ -66,22 +66,22 @@ const char* SaveStateFile = NULL; // Name of SaveFile for access check. // statistics u32 g_nGenVars = 0, g_nTexVars = 0, g_nAlphaVars = 0, g_nResolve = 0; -#define VER 21 +#define VER 1 const unsigned char zgsversion = PS2E_GS_VERSION; unsigned char zgsrevision = 0; // revision and build gives plugin version unsigned char zgsbuild = VER; -unsigned char zgsminor = 209; +unsigned char zgsminor = 0; #ifdef _DEBUG -char *libraryName = "ZZ Ogl (Debug) "; +char *libraryName = "ZZ Ogl PG (Debug) "; #elif defined(RELEASE_TO_PUBLIC) -char *libraryName = "ZZ Ogl "; +char *libraryName = "ZZ Ogl PG "; #else -char *libraryName = "ZZ Ogl (Dev) "; +char *libraryName = "ZZ Ogl PG (Dev) "; #endif static const char* s_aa[5] = { "AA none |", "AA 2x |", "AA 4x |", "AA 8x |", "AA 16x |" }; -static const char* s_naa[3] = { "nattive res |", "res /2 |", "res /4 |" }; +static const char* s_naa[3] = { "native res |", "res /2 |", "res /4 |" }; static const char* pbilinear[] = { "off", "normal", "forced" }; extern GIFRegHandler g_GIFPackedRegHandlers[]; diff --git a/plugins/zzogl-pg/opengl/Linux/Conf.cpp b/plugins/zzogl-pg/opengl/Linux/Conf.cpp index 2b0070bc6d..e33bb67000 100644 --- a/plugins/zzogl-pg/opengl/Linux/Conf.cpp +++ b/plugins/zzogl-pg/opengl/Linux/Conf.cpp @@ -26,7 +26,7 @@ void SaveConfig() { - const std::string iniFile( s_strIniPath + "zerogs.ini" ); + const std::string iniFile( s_strIniPath + "zzogl-pg.ini" ); FILE* f = fopen(iniFile.c_str(),"w"); if (f == NULL) @@ -57,7 +57,7 @@ void LoadConfig() conf.height = 480; conf.aa = 0; - const std::string iniFile( s_strIniPath + "zerogs.ini" ); + const std::string iniFile( s_strIniPath + "zzogl-pg.ini" ); FILE* f = fopen(iniFile.c_str(), "r"); if (f == NULL) { diff --git a/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp b/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp new file mode 100644 index 0000000000..6e4cf8761b --- /dev/null +++ b/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp @@ -0,0 +1,129 @@ + + + + + + diff --git a/plugins/zzogl-pg/opengl/Win32/Conf.cpp b/plugins/zzogl-pg/opengl/Win32/Conf.cpp index 298ff9535d..7b04970243 100644 --- a/plugins/zzogl-pg/opengl/Win32/Conf.cpp +++ b/plugins/zzogl-pg/opengl/Win32/Conf.cpp @@ -9,7 +9,7 @@ extern HINSTANCE hInst; void SaveConfig() { char szValue[256]; - const std::string iniFile( s_strIniPath + "zerogs.ini" ); + const std::string iniFile( s_strIniPath + "zzogl-pg.ini" ); sprintf(szValue,"%u",conf.interlace); WritePrivateProfileString("Settings", "Interlace",szValue,iniFile.c_str()); @@ -25,7 +25,7 @@ void SaveConfig() { void LoadConfig() { char szValue[256]; - const std::string iniFile( s_strIniPath + "zerogs.ini" ); + const std::string iniFile( s_strIniPath + "zzogl-pg.ini" ); memset(&conf, 0, sizeof(conf)); conf.interlace = 0; // on, mode 1 diff --git a/plugins/zzogl-pg/opengl/ZZoglCreate.cpp b/plugins/zzogl-pg/opengl/ZZoglCreate.cpp index a0fc86587e..f2d1b9c222 100644 --- a/plugins/zzogl-pg/opengl/ZZoglCreate.cpp +++ b/plugins/zzogl-pg/opengl/ZZoglCreate.cpp @@ -594,7 +594,7 @@ inline bool ZeroGS::CreateOpenShadersFile() { FILE* f = fopen(EFFECT_NAME, "r"); if( f == NULL ) { - strcpy(tempstr, "../../plugins/ZZOgl/opengl/"); + strcpy(tempstr, "../../plugins/zzogl-pg/opengl/"); sprintf(EFFECT_NAME, "%sps2hw.fx", tempstr); f = fopen(EFFECT_NAME, "r");