PCSX2/pcsx2-sourceforge
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2-sourceforge.git synced 2026-02-04 03:11:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

zerogs fixes

Browse Source
This commit is contained in:
zerofrog
2007-11-17 22:19:13 +00:00
parent dcf12819ad
commit 50f77e76a3
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/gs/zerogs/opengl/GSmain.cpp
View File

@@ -63,10 +63,10 @@ int g_GameSettings = 0;
u32 g_nGenVars = 0, g_nTexVars = 0, g_nAlphaVars = 0, g_nResolve = 0;
#define VER 96
const unsigned char version = PS2E_GS_VERSION;
unsigned char revision = 0; // revision and build gives plugin version
unsigned char build = VER;
unsigned char minor = 7;
const unsigned char zgsversion = PS2E_GS_VERSION;
unsigned char zgsrevision = 0; // revision and build gives plugin version
unsigned char zgsbuild = VER;
unsigned char zgsminor = 7;
#ifdef _DEBUG
char *libraryName = "ZeroGS OpenGL (Debug) ";
@@ -102,7 +102,7 @@ char* CALLBACK PS2EgetLibName() {
}
u32 CALLBACK PS2EgetLibVersion2(u32 type) {
return (version<<16) | (revision<<8) | build | (minor << 24);
return (zgsversion<<16) | (zgsrevision<<8) | zgsbuild | (zgsminor << 24);
}
static u64 luPerfFreq;
@@ -791,7 +791,7 @@ void CALLBACK GSvsync(int interlace)
#ifdef RELEASE_TO_PUBLIC
const char* g_pShaders[4] = { "full", "reduced", "accurate", "accurate-reduced" };
sprintf(strtitle, "ZeroGS KOSMOS 0.%d.%d %.1f fps | %s%s%s%s %s (%.1f)", build, minor, fFPS,
sprintf(strtitle, "ZeroGS KOSMOS 0.%d.%d %.1f fps | %s%s%s%s %s (%.1f)", zgsbuild, zgsminor, fFPS,
(conf.interlace < 2) ? "interlace | " : "",
conf.bilinear ? (conf.bilinear==2?"forced bilinear | ":"bilinear | ") : "",
conf.aa ? s_aa[conf.aa] : "",

4
plugins/gs/zerogs/opengl/zerogs.cpp
View File

@@ -64,7 +64,7 @@ extern u32 g_nGenVars, g_nTexVars, g_nAlphaVars, g_nResolve;
extern char *libraryName;
extern int g_nFrame, g_nRealFrame;
extern float fFPS;
extern unsigned char revision, build, minor;
extern unsigned char zgsrevision, zgsbuild, zgsminor;
BOOL g_bDisplayMsg = 1;
@@ -3943,7 +3943,7 @@ void ZeroGS::RenderCRTC(int interlace)
if( g_bMakeSnapshot ) {
char str[64];
int left = 200, top = 15;
sprintf(str, "ZeroGS %d.%d.%d - %.1f fps %s", revision, build, minor, fFPS, s_frameskipping?" - frameskipping":"");
sprintf(str, "ZeroGS %d.%d.%d - %.1f fps %s", zgsrevision, zgsbuild, zgsminor, fFPS, s_frameskipping?" - frameskipping":"");
DrawText(str, left+1, top+1, 0xff000000);
DrawText(str, left, top, 0xffc0ffff);

2
plugins/gs/zerogs/opengl/zerogs.h
View File

@@ -376,7 +376,7 @@ namespace ZeroGS {
// notify VB that nVerts need to be written to pbuf
inline void NotifyWrite(int nVerts) {
assert( pBufferData != NULL && nCount < nNumVertices && nVerts > 0 );
assert( pBufferData != NULL && nCount <= nNumVertices && nVerts > 0 );
if( nCount + nVerts > nNumVertices ) {
// recreate except with a bigger count

2
plugins/spu2/zerospu2/Linux.cpp
View File

@@ -323,7 +323,7 @@ extern char* libraryName;
extern string s_strIniPath;
void CALLBACK SPU2about() {
SysMessage("%s %d.%d\ndeveloper: zerofrog", libraryName, SPU2_VERSION, BUILD);
SysMessage("%s %d.%d\ndeveloper: zerofrog", libraryName, SPU2_VERSION, SPU2_BUILD);
}
void SaveConfig() {

4
plugins/spu2/zerospu2/zerospu2.cpp
View File

@@ -168,7 +168,7 @@ char* CALLBACK PS2EgetLibName() {
}
u32 CALLBACK PS2EgetLibVersion2(u32 type) {
return (SPU2_MINOR<<24)|(SPU2_VERSION<<16)|(REVISION<<8)|BUILD;
return (SPU2_MINOR<<24)|(SPU2_VERSION<<16)|(SPU2_REVISION<<8)|SPU2_BUILD;
}
void __Log(char *fmt, ...) {
@@ -187,7 +187,7 @@ s32 CALLBACK SPU2init()
{
spu2Log = fopen("logs/spu2.txt", "w");
if (spu2Log) setvbuf(spu2Log, NULL, _IONBF, 0);
SPU2_LOG("Spu2 null version %d,%d\n",REVISION,BUILD);
SPU2_LOG("Spu2 null version %d,%d\n",SPU2_REVISION,SPU2_BUILD);
SPU2_LOG("SPU2init\n");
#ifdef _WIN32

4
plugins/spu2/zerospu2/zerospu2.h
View File

@@ -87,8 +87,8 @@ extern FILE *spu2Log;
#endif
#define SPU2_VERSION PS2E_SPU2_VERSION
#define REVISION 0
#define BUILD 4 // increase that with each version
#define SPU2_REVISION 0
#define SPU2_BUILD 4 // increase that with each version
#define SPU2_MINOR 4
#define OPTION_TIMESTRETCH 1 // stretches samples without changing pitch to reduce cracking