From fab3d1d4b71f6f4ca5f756352f9750f0df5de3d1 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Sat, 10 Jul 2010 12:41:49 +0000 Subject: [PATCH] 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 --- plugins/zzogl-pg/opengl/GS.h | 2 +- plugins/zzogl-pg/opengl/GSmain.cpp | 4 ++++ plugins/zzogl-pg/opengl/GifTransfer.h | 1 + plugins/zzogl-pg/opengl/Profile.cpp | 4 ++-- plugins/zzogl-pg/opengl/Win32/Conf.cpp | 2 +- .../opengl/Win32/zerogsogl_2008.vcproj | 24 ++++++++++++------- 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/plugins/zzogl-pg/opengl/GS.h b/plugins/zzogl-pg/opengl/GS.h index 6d1fa77e8d..3ac73bde9b 100644 --- a/plugins/zzogl-pg/opengl/GS.h +++ b/plugins/zzogl-pg/opengl/GS.h @@ -645,7 +645,7 @@ typedef struct ((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.y = y; diff --git a/plugins/zzogl-pg/opengl/GSmain.cpp b/plugins/zzogl-pg/opengl/GSmain.cpp index 06a0bcdb21..9e15dc7d85 100644 --- a/plugins/zzogl-pg/opengl/GSmain.cpp +++ b/plugins/zzogl-pg/opengl/GSmain.cpp @@ -288,6 +288,10 @@ void CALLBACK GSwriteCSR(u32 write) gs.CSRw = write; } +#ifdef _WIN32 +#define access _access +#endif + void CALLBACK GSchangeSaveState(int newstate, const char* filename) { FUNCLOG diff --git a/plugins/zzogl-pg/opengl/GifTransfer.h b/plugins/zzogl-pg/opengl/GifTransfer.h index a03ba4d7b0..a3decfa3a4 100644 --- a/plugins/zzogl-pg/opengl/GifTransfer.h +++ b/plugins/zzogl-pg/opengl/GifTransfer.h @@ -20,6 +20,7 @@ #ifndef GIFTRANSFER_H_INCLUDED #define GIFTRANSFER_H_INCLUDED +#include "GS.h" #include "Regs.h" #include "Util.h" diff --git a/plugins/zzogl-pg/opengl/Profile.cpp b/plugins/zzogl-pg/opengl/Profile.cpp index c30a6b2213..2b68c0dfcc 100644 --- a/plugins/zzogl-pg/opengl/Profile.cpp +++ b/plugins/zzogl-pg/opengl/Profile.cpp @@ -171,7 +171,7 @@ u64 DVProfWriteStruct(FILE* f, DVPROFSTRUCT* p, int ident) list::iterator ittime = p->listTimes.begin(); - u32 utime = 0; + u64 utime = 0; while (ittime != p->listTimes.end()) { @@ -196,7 +196,7 @@ u64 DVProfWriteStruct(FILE* f, DVPROFSTRUCT* p, int ident) while (itprof != p->listpChild.end()) { - uex -= DVProfWriteStruct(f, *itprof, ident + 4); + uex -= (u32)DVProfWriteStruct(f, *itprof, ident + 4); ++itprof; } diff --git a/plugins/zzogl-pg/opengl/Win32/Conf.cpp b/plugins/zzogl-pg/opengl/Win32/Conf.cpp index 9bd22d7c31..dd398dea46 100644 --- a/plugins/zzogl-pg/opengl/Win32/Conf.cpp +++ b/plugins/zzogl-pg/opengl/Win32/Conf.cpp @@ -61,7 +61,7 @@ void LoadConfig() GetPrivateProfileString("Settings", "AdvancedOptions", NULL, szValue, 20, iniFile.c_str()); conf.hacks._u32 = strtoul(szValue, NULL, 10); 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()); conf.width = strtoul(szValue, NULL, 10); GetPrivateProfileString("Settings", "Height", NULL, szValue, 20, iniFile.c_str()); diff --git a/plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj b/plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj index f4d0752a90..76b6d2fb8d 100644 --- a/plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj +++ b/plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj @@ -289,6 +289,10 @@ RelativePath="..\memcpy_amd.cpp" > + + @@ -421,6 +425,10 @@ RelativePath="..\Mem_Transmit.h" > + + @@ -465,14 +473,6 @@ RelativePath="..\x86.h" > - - - - @@ -481,6 +481,14 @@ RelativePath="..\zerogsmath.h" > + + + +