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

zzogl-pg: A few Windows changes, and fix an incorrect variable type. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3450 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-07-10 12:41:49 +00:00
parent fded5fc218
commit fab3d1d4b7
6 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/zzogl-pg/opengl/GS.h
View File

@ -645,7 +645,7 @@ typedef struct
((a & 0xff) << 24); ((a & 0xff) << 24);
} }
void add_vertex(u16 x, u16 y, u32 z, float f) void add_vertex(u16 x, u16 y, u32 z, u16 f)
{ {
vertexregs.x = x; vertexregs.x = x;
vertexregs.y = y; vertexregs.y = y;

4
plugins/zzogl-pg/opengl/GSmain.cpp
View File

@ -288,6 +288,10 @@ void CALLBACK GSwriteCSR(u32 write)
gs.CSRw = write; gs.CSRw = write;
} }
#ifdef _WIN32
#define access _access
#endif
void CALLBACK GSchangeSaveState(int newstate, const char* filename) void CALLBACK GSchangeSaveState(int newstate, const char* filename)
{ {
FUNCLOG FUNCLOG

1
plugins/zzogl-pg/opengl/GifTransfer.h
View File

@ -20,6 +20,7 @@
#ifndef GIFTRANSFER_H_INCLUDED #ifndef GIFTRANSFER_H_INCLUDED
#define GIFTRANSFER_H_INCLUDED #define GIFTRANSFER_H_INCLUDED
#include "GS.h"
#include "Regs.h" #include "Regs.h"
#include "Util.h" #include "Util.h"

4
plugins/zzogl-pg/opengl/Profile.cpp
View File

@ -171,7 +171,7 @@ u64 DVProfWriteStruct(FILE* f, DVPROFSTRUCT* p, int ident)
list<DVPROFSTRUCT::DATA>::iterator ittime = p->listTimes.begin(); list<DVPROFSTRUCT::DATA>::iterator ittime = p->listTimes.begin();
u32 utime = 0; u64 utime = 0;
while (ittime != p->listTimes.end()) while (ittime != p->listTimes.end())
{ {
@ -196,7 +196,7 @@ u64 DVProfWriteStruct(FILE* f, DVPROFSTRUCT* p, int ident)
while (itprof != p->listpChild.end()) while (itprof != p->listpChild.end())
{ {
uex -= DVProfWriteStruct(f, *itprof, ident + 4); uex -= (u32)DVProfWriteStruct(f, *itprof, ident + 4);
++itprof; ++itprof;
} }

2
plugins/zzogl-pg/opengl/Win32/Conf.cpp
View File

@ -61,7 +61,7 @@ void LoadConfig()
GetPrivateProfileString("Settings", "AdvancedOptions", NULL, szValue, 20, iniFile.c_str()); GetPrivateProfileString("Settings", "AdvancedOptions", NULL, szValue, 20, iniFile.c_str());
conf.hacks._u32 = strtoul(szValue, NULL, 10); conf.hacks._u32 = strtoul(szValue, NULL, 10);
GetPrivateProfileString("Settings", "Bilinear", NULL, szValue, 20, iniFile.c_str()); GetPrivateProfileString("Settings", "Bilinear", NULL, szValue, 20, iniFile.c_str());
conf.bilinear = strtoul(szValue, NULL, 10); conf.bilinear = (u8)strtoul(szValue, NULL, 10);
GetPrivateProfileString("Settings", "Width", NULL, szValue, 20, iniFile.c_str()); GetPrivateProfileString("Settings", "Width", NULL, szValue, 20, iniFile.c_str());
conf.width = strtoul(szValue, NULL, 10); conf.width = strtoul(szValue, NULL, 10);
GetPrivateProfileString("Settings", "Height", NULL, szValue, 20, iniFile.c_str()); GetPrivateProfileString("Settings", "Height", NULL, szValue, 20, iniFile.c_str());

24
plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj
View File

@ -289,6 +289,10 @@
RelativePath="..\memcpy_amd.cpp" RelativePath="..\memcpy_amd.cpp"
> >
</File> </File>
<File
RelativePath="..\NewRegs.cpp"
>
</File>
<File <File
RelativePath="..\Profile.cpp" RelativePath="..\Profile.cpp"
> >
@ -421,6 +425,10 @@
RelativePath="..\Mem_Transmit.h" RelativePath="..\Mem_Transmit.h"
> >
</File> </File>
<File
RelativePath="..\NewRegs.h"
>
</File>
<File <File
RelativePath="..\Profile.h" RelativePath="..\Profile.h"
> >
@ -465,14 +473,6 @@
RelativePath="..\x86.h" RelativePath="..\x86.h"
> >
</File> </File>
<File
RelativePath="..\ZZGl.h"
>
</File>
<File
RelativePath="..\ZZLog.h"
>
</File>
<File <File
RelativePath="..\zerogs.h" RelativePath="..\zerogs.h"
> >
@ -481,6 +481,14 @@
RelativePath="..\zerogsmath.h" RelativePath="..\zerogsmath.h"
> >
</File> </File>
<File
RelativePath="..\ZZGl.h"
>
</File>
<File
RelativePath="..\ZZLog.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Resource Files" Name="Resource Files"