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

zzogl-pg: Missed the Windows specific files. BOOL->bool in a few places. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2933 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-05-01 23:34:44 +00:00
parent 12ad5308ed
commit c160aa495a
16 changed files with 231 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/zzogl-pg/opengl/GLWin32.cpp
View File

@ -108,7 +108,7 @@ bool GLWindow::CreateWindow(void *pDisplay)
dwStyle = WS_OVERLAPPEDWINDOW;
}
AdjustWindowRectEx(&rc, dwStyle, FALSE, dwExStyle);
AdjustWindowRectEx(&rc, dwStyle, false, dwExStyle);
GetWindowRect(GetDesktopWindow(), &rcdesktop);
@ -193,7 +193,7 @@ bool GLWindow::DisplayWindow(int _width, int _height)
dwExStyle = WS_EX_APPWINDOW;
dwStyle = WS_POPUP;
ShowCursor(FALSE);
ShowCursor(false);
}
else
{
@ -207,7 +207,7 @@ bool GLWindow::DisplayWindow(int _width, int _height)
rc.top = 0;
rc.right = nBackbufferWidth;
rc.bottom = nBackbufferHeight;
AdjustWindowRectEx(&rc, dwStyle, FALSE, dwExStyle);
AdjustWindowRectEx(&rc, dwStyle, false, dwExStyle);
int X = (rcdesktop.right - rcdesktop.left) / 2 - (rc.right - rc.left) / 2;
int Y = (rcdesktop.bottom - rcdesktop.top) / 2 - (rc.bottom - rc.top) / 2;

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

@ -58,7 +58,7 @@ u8* g_pBasePS2Mem = NULL;
int g_TransferredToGPU = 0;
std::string s_strIniPath("inis/"); // Air's new ini path (r2361)
//static BOOL g_bHidden = 0;
//static bool g_bHidden = 0;
int g_GameSettings = 0;
int CurrentSavestate = 0; // Number of SaveSlot. Default is 0
bool SaveStateExists = true; // We could not know save slot status before first change occured
@ -95,7 +95,7 @@ extern int g_nFramesSkipped;
#if !defined(ZEROGS_DEVBUILD)
#define g_bWriteProfile 0
#else
BOOL g_bWriteProfile = 0;
bool g_bWriteProfile = 0;
#endif
int s_frameskipping = 0;
@ -577,7 +577,7 @@ void OnKeyboardF7(int shift)
if (!shift)
{
extern BOOL g_bDisplayFPS;
extern bool g_bDisplayFPS;
g_bDisplayFPS ^= 1;
}
else

10
plugins/zzogl-pg/opengl/Linux/Linux.cpp
View File

@ -106,9 +106,9 @@ void CreateGameHackTable(GtkWidget *treeview)
gtk_tree_view_column_set_title(treecol, "Select");
gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), treecol);
treerend = gtk_cell_renderer_toggle_new();
gtk_tree_view_column_pack_start(treecol, treerend, TRUE);
gtk_tree_view_column_pack_start(treecol, treerend, true);
gtk_tree_view_column_add_attribute(treecol, treerend, "active", 0);//link 'active' attrib to first column of model
g_object_set(treerend, "activatable", TRUE, NULL);//set 'activatable' attrib true by default for all rows regardless of model.
g_object_set(treerend, "activatable", true, NULL);//set 'activatable' attrib true by default for all rows regardless of model.
g_signal_connect(treerend, "toggled", (GCallback) OnToggle_advopts, treestore);//set a global callback, we also pass a reference to our treestore.
//COLUMN 1 is the text descriptions
@ -116,7 +116,7 @@ void CreateGameHackTable(GtkWidget *treeview)
gtk_tree_view_column_set_title(treecol, "Description");
gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), treecol);
treerend = gtk_cell_renderer_text_new();
gtk_tree_view_column_pack_start(treecol, treerend, TRUE);
gtk_tree_view_column_pack_start(treecol, treerend, true);
gtk_tree_view_column_add_attribute(treecol, treerend, "text", 1);//link 'text' attrib to second column of model
//setup the model with all our rows of option data
@ -149,7 +149,7 @@ void CreateGameHackTable(GtkWidget *treeview)
for (map<string, confOptsStruct>::iterator it = mapConfOpts.begin(); it != mapConfOpts.end(); ++it)
{
gtk_list_store_append(treestore, &treeiter);//new row
itval = (conf.gamesettings & it->second.value) ? TRUE : FALSE;
itval = (conf.gamesettings & it->second.value) ? true : false;
snprintf(descbuf, 254, "%s", it->second.desc);
gtk_list_store_set(treestore, &treeiter, 0, itval, 1, descbuf, -1);
}
@ -177,7 +177,7 @@ void SaveGameHackTable(GtkWidget *treeview)
for (map<string, confOptsStruct>::iterator it = mapConfOpts.begin(); it != mapConfOpts.end(); ++it)
{
treeoptval = FALSE;
treeoptval = false;
gtk_tree_model_get(treemodel, &treeiter, 0, &treeoptval, -1);
if (treeoptval) conf.gamesettings |= it->second.value;

14
plugins/zzogl-pg/opengl/Regs.cpp
View File

@ -309,7 +309,7 @@ void tex2Write(int i, u32 *data)
{
ZeroGS::texClutWrite(i);
// invalidate to make sure target didn't change!
ZeroGS::vb[i].bVarsTexSync = FALSE;
ZeroGS::vb[i].bVarsTexSync = false;
}
return;
@ -318,8 +318,8 @@ void tex2Write(int i, u32 *data)
ZeroGS::Flush(i);
ZeroGS::vb[i].bVarsTexSync = FALSE;
ZeroGS::vb[i].bTexConstsSync = FALSE;
ZeroGS::vb[i].bVarsTexSync = false;
ZeroGS::vb[i].bTexConstsSync = false;
s_uTex0Data[0] = (s_uTex0Data[0] & ~0x03f00000) | (psm << 20);
s_uTex0Data[1] = (s_uTex0Data[1] & 0x1f) | (data[1] & ~0x1f);
@ -394,7 +394,7 @@ __forceinline void clampWrite(int i, u32 *data)
clamp.minv = ((data[0] >> 24) & 0xff) | ((data[1] & 0x3) << 8);
clamp.maxv = (data[1] >> 2) & 0x3ff;
ZeroGS::vb[i].bTexConstsSync = FALSE;
ZeroGS::vb[i].bTexConstsSync = false;
}
}
@ -563,7 +563,7 @@ void tex1Write(int i, u32* data)
if (conf.bilinear == 1 && (tex1.mmag != ((data[0] >> 5) & 0x1) || tex1.mmin != ((data[0] >> 6) & 0x7)))
{
ZeroGS::Flush(i);
ZeroGS::vb[i].bVarsTexSync = FALSE;
ZeroGS::vb[i].bVarsTexSync = false;
}
tex1.lcm = (data[0]) & 0x1;
@ -736,8 +736,8 @@ void __fastcall GIFRegHandlerTEXA(u32* data)
gs.texa.fta[0] = newinfo.ta[0] / 255.0f;
gs.texa.fta[1] = newinfo.ta[1] / 255.0f;
ZeroGS::vb[0].bTexConstsSync = FALSE;
ZeroGS::vb[1].bTexConstsSync = FALSE;
ZeroGS::vb[0].bTexConstsSync = false;
ZeroGS::vb[1].bTexConstsSync = false;
}
}

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

@ -6,26 +6,27 @@
extern HINSTANCE hInst;
void SaveConfig() {
void SaveConfig()
{
char szValue[256];
const std::string iniFile( s_strIniPath + "zzogl-pg.ini" );
const std::string iniFile(s_strIniPath + "zzogl-pg.ini");
sprintf(szValue,"%u",conf.interlace);
WritePrivateProfileString("Settings", "Interlace",szValue,iniFile.c_str());
sprintf(szValue,"%u",conf.aa);
WritePrivateProfileString("Settings", "Antialiasing",szValue,iniFile.c_str());
sprintf(szValue,"%u",conf.bilinear);
WritePrivateProfileString("Settings", "Bilinear",szValue,iniFile.c_str());
sprintf(szValue,"%u",conf.options);
WritePrivateProfileString("Settings", "Options",szValue,iniFile.c_str());
sprintf(szValue,"%u",conf.gamesettings);
WritePrivateProfileString("Settings", "AdvancedOptions",szValue,iniFile.c_str());
sprintf(szValue, "%u", conf.interlace);
WritePrivateProfileString("Settings", "Interlace", szValue, iniFile.c_str());
sprintf(szValue, "%u", conf.aa);
WritePrivateProfileString("Settings", "Antialiasing", szValue, iniFile.c_str());
sprintf(szValue, "%u", conf.bilinear);
WritePrivateProfileString("Settings", "Bilinear", szValue, iniFile.c_str());
sprintf(szValue, "%u", conf.options);
WritePrivateProfileString("Settings", "Options", szValue, iniFile.c_str());
sprintf(szValue, "%u", conf.gamesettings);
WritePrivateProfileString("Settings", "AdvancedOptions", szValue, iniFile.c_str());
}
void LoadConfig() {
void LoadConfig()
{
char szValue[256];
const std::string iniFile( s_strIniPath + "zzogl-pg.ini" );
const std::string iniFile(s_strIniPath + "zzogl-pg.ini");
memset(&conf, 0, sizeof(conf));
conf.interlace = 0; // on, mode 1
@ -35,13 +36,15 @@ void LoadConfig() {
conf.width = 640;
conf.height = 480;
FILE *fp=fopen(iniFile.c_str(),"rt");
FILE *fp = fopen(iniFile.c_str(), "rt");
if (!fp)
{
CreateDirectory(s_strIniPath.c_str(),NULL);
CreateDirectory(s_strIniPath.c_str(), NULL);
SaveConfig();//save and return
return ;
}
fclose(fp);
GetPrivateProfileString("Settings", "Interlace", NULL, szValue, 20, iniFile.c_str());
@ -55,23 +58,27 @@ void LoadConfig() {
GetPrivateProfileString("Settings", "Bilinear", NULL, szValue, 20, iniFile.c_str());
conf.bilinear = strtoul(szValue, NULL, 10);
if( conf.aa < 0 || conf.aa > 4 ) conf.aa = 0;
if (conf.aa < 0 || conf.aa > 4) conf.aa = 0;
conf.isWideScreen = ((conf.options & GSOPTION_WIDESCREEN) != 0);
switch(conf.options & GSOPTION_WINDIMS)
switch (conf.options & GSOPTION_WINDIMS)
{
case GSOPTION_WIN640:
conf.width = 640;
conf.height = conf.isWideScreen ? 360 : 480;
break;
case GSOPTION_WIN800:
conf.width = 800;
conf.height = conf.isWideScreen ? 450 : 600;
break;
case GSOPTION_WIN1024:
conf.width = 1024;
conf.height = conf.isWideScreen ? 576 : 768;
break;
case GSOPTION_WIN1280:
conf.width = 1280;
conf.height = conf.isWideScreen ? 720 : 960;
@ -79,10 +86,12 @@ void LoadConfig() {
}
// turn off all hacks by defaultof
conf.options &= ~(GSOPTION_WIREFRAME|GSOPTION_CAPTUREAVI);
conf.options &= ~(GSOPTION_WIREFRAME | GSOPTION_CAPTUREAVI);
conf.options |= GSOPTION_LOADED;
if( conf.width <= 0 || conf.height <= 0 ) {
if (conf.width <= 0 || conf.height <= 0)
{
conf.width = 640;
conf.height = 480;
}

213
plugins/zzogl-pg/opengl/Win32/Win32.cpp
View File

@ -9,13 +9,15 @@
#include "Win32.h"
#include <map>
using namespace std;
extern int g_nPixelShaderVer;
static int prevbilinearfilter;
HINSTANCE hInst=NULL;
HINSTANCE hInst = NULL;
void CALLBACK GSkeyEvent(keyEvent *ev) {
void CALLBACK GSkeyEvent(keyEvent *ev)
{
// switch (ev->event) {
// case KEYPRESS:
// switch (ev->key) {
@ -35,29 +37,40 @@ void CALLBACK GSkeyEvent(keyEvent *ev) {
#include "Win32/resource.h"
BOOL CALLBACK LoggingDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
switch(uMsg) {
bool CALLBACK LoggingDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
{
case WM_INITDIALOG:
if (conf.log) CheckDlgButton(hW, IDC_LOG, TRUE);
return TRUE;
if (conf.log) CheckDlgButton(hW, IDC_LOG, true);
return true;
case WM_COMMAND:
switch(LOWORD(wParam)) {
switch (LOWORD(wParam))
{
case IDCANCEL:
EndDialog(hW, FALSE);
return TRUE;
EndDialog(hW, true);
return true;
case IDOK:
if (IsDlgButtonChecked(hW, IDC_LOG))
conf.log = 1;
else
else
conf.log = 0;
SaveConfig();
EndDialog(hW, FALSE);
return TRUE;
EndDialog(hW, false);
return true;
}
}
return FALSE;
return false;
}
map<int, int> mapConfOpts;
@ -65,25 +78,25 @@ map<int, int> mapConfOpts;
void OnInitDialog(HWND hW)
{
if( !(conf.options & GSOPTION_LOADED) )
LoadConfig();
if (!(conf.options & GSOPTION_LOADED)) LoadConfig();
CheckDlgButton(hW, IDC_CONFIG_INTERLACE, conf.interlace);
CheckDlgButton(hW, IDC_CONFIG_BILINEAR, conf.bilinear);
CheckDlgButton(hW, IDC_CONFIG_DEPTHWRITE, conf.mrtdepth);
CheckRadioButton(hW,IDC_CONFIG_AANONE,IDC_CONFIG_AA4, IDC_CONFIG_AANONE+conf.aa);
CheckDlgButton(hW, IDC_CONFIG_WIREFRAME, (conf.options&GSOPTION_WIREFRAME)?1:0);
CheckDlgButton(hW, IDC_CONFIG_CAPTUREAVI, (conf.options&GSOPTION_CAPTUREAVI)?1:0);
CheckRadioButton(hW, IDC_CONFIG_AANONE, IDC_CONFIG_AA4, IDC_CONFIG_AANONE + conf.aa);
CheckDlgButton(hW, IDC_CONFIG_WIREFRAME, (conf.options&GSOPTION_WIREFRAME) ? 1 : 0);
CheckDlgButton(hW, IDC_CONFIG_CAPTUREAVI, (conf.options&GSOPTION_CAPTUREAVI) ? 1 : 0);
//CheckDlgButton(hW, IDC_CONFIG_CACHEFBP, (conf.options&GSOPTION_ALPHACLAMP)?1:0);
CheckDlgButton(hW, IDC_CONFIG_FULLSCREEN, (conf.options&GSOPTION_FULLSCREEN)?1:0);
CheckDlgButton(hW, IDC_CONFIG_WIDESCREEN, (conf.options&GSOPTION_WIDESCREEN)?1:0);
CheckDlgButton(hW, IDC_CONFIG_FULLSCREEN, (conf.options&GSOPTION_FULLSCREEN) ? 1 : 0);
CheckDlgButton(hW, IDC_CONFIG_WIDESCREEN, (conf.options&GSOPTION_WIDESCREEN) ? 1 : 0);
//CheckDlgButton(hW, IDC_CONFIG_FFX, (conf.options&GSOPTION_FFXHACK)?1:0);
CheckDlgButton(hW, IDC_CONFIG_BMPSS, (conf.options&GSOPTION_TGASNAP)?1:0);
CheckRadioButton(hW,IDC_CONF_WIN640, IDC_CONF_WIN1280, IDC_CONF_WIN640+((conf.options&GSOPTION_WINDIMS)>>4));
CheckDlgButton(hW, IDC_CONFIG_BMPSS, (conf.options&GSOPTION_TGASNAP) ? 1 : 0);
CheckRadioButton(hW, IDC_CONF_WIN640, IDC_CONF_WIN1280, IDC_CONF_WIN640 + ((conf.options&GSOPTION_WINDIMS) >> 4));
prevbilinearfilter = conf.bilinear;
mapConfOpts.clear();
PUT_CONF(00000001);
PUT_CONF(00000002);
PUT_CONF(00000004);
@ -112,44 +125,55 @@ void OnInitDialog(HWND hW)
PUT_CONF(04000000);
PUT_CONF(10000000);
for(map<int, int>::iterator it = mapConfOpts.begin(); it != mapConfOpts.end(); ++it) {
CheckDlgButton(hW, it->first, (conf.gamesettings&it->second)?1:0);
for (map<int, int>::iterator it = mapConfOpts.begin(); it != mapConfOpts.end(); ++it)
{
CheckDlgButton(hW, it->first, (conf.gamesettings&it->second) ? 1 : 0);
}
}
void OnOK(HWND hW) {
void OnOK(HWND hW)
{
u32 newinterlace = IsDlgButtonChecked(hW, IDC_CONFIG_INTERLACE);
if( !conf.interlace ) conf.interlace = newinterlace;
else if( !newinterlace ) conf.interlace = 2; // off
if (!conf.interlace) conf.interlace = newinterlace;
else if (!newinterlace) conf.interlace = 2; // off
conf.bilinear = IsDlgButtonChecked(hW, IDC_CONFIG_BILINEAR);
// restore
if( conf.bilinear && prevbilinearfilter )
if (conf.bilinear && prevbilinearfilter)
conf.bilinear = prevbilinearfilter;
//conf.mrtdepth = 1;//IsDlgButtonChecked(hW, IDC_CONFIG_DEPTHWRITE);
if( SendDlgItemMessage(hW,IDC_CONFIG_AANONE,BM_GETCHECK,0,0) ) {
if (SendDlgItemMessage(hW, IDC_CONFIG_AANONE, BM_GETCHECK, 0, 0))
{
conf.aa = 0;
}
else if( SendDlgItemMessage(hW,IDC_CONFIG_AA2,BM_GETCHECK,0,0) ) {
else if (SendDlgItemMessage(hW, IDC_CONFIG_AA2, BM_GETCHECK, 0, 0))
{
conf.aa = 1;
}
else if( SendDlgItemMessage(hW,IDC_CONFIG_AA4,BM_GETCHECK,0,0) ) {
else if (SendDlgItemMessage(hW, IDC_CONFIG_AA4, BM_GETCHECK, 0, 0))
{
conf.aa = 2;
}
else if( SendDlgItemMessage(hW,IDC_CONFIG_AA8,BM_GETCHECK,0,0) ) {
else if (SendDlgItemMessage(hW, IDC_CONFIG_AA8, BM_GETCHECK, 0, 0))
{
conf.aa = 3;
}
else if( SendDlgItemMessage(hW,IDC_CONFIG_AA16,BM_GETCHECK,0,0) ) {
else if (SendDlgItemMessage(hW, IDC_CONFIG_AA16, BM_GETCHECK, 0, 0))
{
conf.aa = 4;
}
else conf.aa = 0;
conf.negaa = 0;
else
{
conf.aa = 0;
}
conf.negaa = 0;
conf.options = 0;
conf.options |= IsDlgButtonChecked(hW, IDC_CONFIG_CAPTUREAVI) ? GSOPTION_CAPTUREAVI : 0;
conf.options |= IsDlgButtonChecked(hW, IDC_CONFIG_WIREFRAME) ? GSOPTION_WIREFRAME : 0;
conf.options |= IsDlgButtonChecked(hW, IDC_CONFIG_FULLSCREEN) ? GSOPTION_FULLSCREEN : 0;
@ -158,115 +182,144 @@ void OnOK(HWND hW) {
conf.options |= IsDlgButtonChecked(hW, IDC_CONFIG_BMPSS) ? GSOPTION_TGASNAP : 0;
conf.gamesettings = 0;
for(map<int, int>::iterator it = mapConfOpts.begin(); it != mapConfOpts.end(); ++it) {
if( IsDlgButtonChecked(hW, it->first) )
conf.gamesettings |= it->second;
for (map<int, int>::iterator it = mapConfOpts.begin(); it != mapConfOpts.end(); ++it)
{
if (IsDlgButtonChecked(hW, it->first)) conf.gamesettings |= it->second;
}
GSsetGameCRC(g_LastCRC, conf.gamesettings);
if( SendDlgItemMessage(hW,IDC_CONF_WIN640,BM_GETCHECK,0,0) ) conf.options |= GSOPTION_WIN640;
else if( SendDlgItemMessage(hW,IDC_CONF_WIN800,BM_GETCHECK,0,0) ) conf.options |= GSOPTION_WIN800;
else if( SendDlgItemMessage(hW,IDC_CONF_WIN1024,BM_GETCHECK,0,0) ) conf.options |= GSOPTION_WIN1024;
else if( SendDlgItemMessage(hW,IDC_CONF_WIN1280,BM_GETCHECK,0,0) ) conf.options |= GSOPTION_WIN1280;
if (SendDlgItemMessage(hW, IDC_CONF_WIN640, BM_GETCHECK, 0, 0))
conf.options |= GSOPTION_WIN640;
else if (SendDlgItemMessage(hW, IDC_CONF_WIN800, BM_GETCHECK, 0, 0))
conf.options |= GSOPTION_WIN800;
else if (SendDlgItemMessage(hW, IDC_CONF_WIN1024, BM_GETCHECK, 0, 0))
conf.options |= GSOPTION_WIN1024;
else if (SendDlgItemMessage(hW, IDC_CONF_WIN1280, BM_GETCHECK, 0, 0))
conf.options |= GSOPTION_WIN1280;
SaveConfig();
EndDialog(hW, FALSE);
EndDialog(hW, false);
}
BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
switch(uMsg) {
bool CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
{
case WM_INITDIALOG:
OnInitDialog(hW);
return TRUE;
return true;
case WM_COMMAND:
switch(LOWORD(wParam)) {
switch (LOWORD(wParam))
{
case IDCANCEL:
EndDialog(hW, TRUE);
return TRUE;
EndDialog(hW, true);
return true;
case IDOK:
OnOK(hW);
return TRUE;
return true;
}
}
return FALSE;
return false;
}
BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
switch(uMsg) {
bool CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
{
case WM_INITDIALOG:
//ZeroGS uses floating point render targets because A8R8G8B8 format is not sufficient for ps2 blending and this requires alpha blending on floating point render targets
//There might be a problem with pixel shader precision with older geforce models (textures will look blocky).
return TRUE;
return true;
case WM_COMMAND:
switch(LOWORD(wParam)) {
switch (LOWORD(wParam))
{
case IDOK:
EndDialog(hW, FALSE);
return TRUE;
EndDialog(hW, false);
return true;
}
}
return FALSE;
return false;
}
void CALLBACK GSconfigure() {
void CALLBACK GSconfigure()
{
DialogBox(hInst,
MAKEINTRESOURCE(IDD_CONFIG),
GetActiveWindow(),
(DLGPROC)ConfigureDlgProc);
MAKEINTRESOURCE(IDD_CONFIG),
GetActiveWindow(),
(DLGPROC)ConfigureDlgProc);
if (g_nPixelShaderVer == SHADER_REDUCED) conf.bilinear = 0;
}
s32 CALLBACK GStest() {
s32 CALLBACK GStest()
{
return 0;
}
void CALLBACK GSabout() {
void CALLBACK GSabout()
{
DialogBox(hInst,
MAKEINTRESOURCE(IDD_ABOUT),
GetActiveWindow(),
(DLGPROC)AboutDlgProc);
}
BOOL APIENTRY DllMain(HANDLE hModule, // DLL INIT
bool APIENTRY DllMain(HANDLE hModule, // DLL INIT
DWORD dwReason,
LPVOID lpReserved) {
LPVOID lpReserved)
{
hInst = (HINSTANCE)hModule;
return TRUE; // very quick :)
return true; // very quick :)
}
static char *err = "Error Loading Symbol";
static int errval;
void *SysLoadLibrary(char *lib) {
void *SysLoadLibrary(char *lib)
{
return LoadLibrary(lib);
}
void *SysLoadSym(void *lib, char *sym) {
void *SysLoadSym(void *lib, char *sym)
{
void *tmp = GetProcAddress((HINSTANCE)lib, sym);
if (tmp == NULL) errval = 1;
else errval = 0;
if (tmp == NULL)
errval = 1;
else
errval = 0;
return tmp;
}
char *SysLibError() {
char *SysLibError()
{
if (errval) { errval = 0; return err; }
return NULL;
}
void SysCloseLibrary(void *lib) {
void SysCloseLibrary(void *lib)
{
FreeLibrary((HINSTANCE)lib);
}
void SysMessage(const char *fmt, ...) {
void SysMessage(const char *fmt, ...)
{
va_list list;
char tmp[512];
va_start(list,fmt);
vsprintf(tmp,fmt,list);
va_start(list, fmt);
vsprintf(tmp, fmt, list);
va_end(list);
MessageBox(0, tmp, "GSsoftdx Msg", 0);
MessageBox(0, tmp, "ZZOgl-PG Msg", 0);
}

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

@ -4,6 +4,6 @@
#include "resrc1.h"
#include "Win32/resource.h"
BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
bool CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
#endif /* __WIN32_H__ */

20
plugins/zzogl-pg/opengl/ZZoglCRTC.cpp
View File

@ -33,8 +33,8 @@ using namespace ZeroGS;
#define g_bSaveFrame 0
#define g_bSaveFinalFrame 0
#else
BOOL g_bSaveFrame = 0; // saves the current psurfTarget
BOOL g_bSaveFinalFrame = 0; // saves the input to the CRTC
bool g_bSaveFrame = 0; // saves the current psurfTarget
bool g_bSaveFinalFrame = 0; // saves the input to the CRTC
#endif // !defined(ZEROGS_DEVBUILD)
#define INTERLACE_COUNT (bInterlace && interlace == (conf.interlace))
@ -49,7 +49,7 @@ extern HDC hDC; // Private GDI Device Context
extern HGLRC hRC; // Permanent Rendering Context
#endif
BOOL g_bCRTCBilinear = TRUE;
bool g_bCRTCBilinear = true;
extern bool g_bIsLost;
int g_nFrameRender = 10;
int g_nFramesSkipped = 0;
@ -65,7 +65,7 @@ extern int s_nWriteDestAlphaTest;
extern int g_PrevBitwiseTexX, g_PrevBitwiseTexY; // textures stored in SAMP_BITWISEANDX and SAMP_BITWISEANDY
BOOL g_bDisplayFPS = FALSE;
bool g_bDisplayFPS = false;
extern bool s_bDestAlphaTest;
extern int s_ClutResolve;
@ -278,7 +278,7 @@ inline void RenderStartHelper(u32 bInterlace)
if (conf.mrtdepth && pvs[8] == NULL)
{
conf.mrtdepth = 0;
s_bWriteDepth = FALSE;
s_bWriteDepth = false;
ZZLog::Debug_Log("Disabling MRT depth writing\n");
}
@ -769,7 +769,7 @@ inline void AfterRenderCountStatistics()
if (--s_nWriteDepthCount <= 0)
{
s_bWriteDepth = FALSE;
s_bWriteDepth = false;
}
}
@ -777,7 +777,7 @@ inline void AfterRenderCountStatistics()
{
if (--s_nWriteDestAlphaTest <= 0)
{
s_bDestAlphaTest = FALSE;
s_bDestAlphaTest = false;
}
}
@ -845,9 +845,9 @@ inline void AfterRendererSwitchBackToTextures()
if (icurctx >= 0)
{
vb[icurctx].bVarsSetTarg = FALSE;
vb[icurctx].bVarsTexSync = FALSE;
vb[0].bVarsTexSync = FALSE;
vb[icurctx].bVarsSetTarg = false;
vb[icurctx].bVarsTexSync = false;
vb[0].bVarsTexSync = false;
}
}

8
plugins/zzogl-pg/opengl/ZZoglCreate.cpp
View File

@ -178,9 +178,9 @@ int s_nFullscreen = 0;
u32 ptexBlocks = 0, ptexConv16to32 = 0; // holds information on block tiling
u32 ptexBilinearBlocks = 0;
u32 ptexConv32to16 = 0;
BOOL g_bDisplayMsg = 1;
bool g_bDisplayMsg = 1;
int g_nDepthBias = 0;
BOOL g_bSaveFlushedFrame = 0;
bool g_bSaveFlushedFrame = 0;
//------------------ Code
@ -550,7 +550,7 @@ bool ZeroGS::Create(int _width, int _height)
GL_STENCILFUNC(GL_ALWAYS, 0, 0);
//g_GameSettings |= 0;//GAME_VSSHACK|GAME_FULL16BITRES|GAME_NODEPTHRESOLVE|GAME_FASTUPDATE;
//s_bWriteDepth = TRUE;
//s_bWriteDepth = true;
GL_BLEND_ALL(GL_ONE, GL_ONE, GL_ONE, GL_ONE);
glViewport(0, 0, nBackbufferWidth, nBackbufferHeight); // Reset The Current Viewport
@ -902,7 +902,7 @@ bool ZeroGS::Create(int _width, int _height)
}
}
void ZeroGS::Destroy(BOOL bD3D)
void ZeroGS::Destroy(bool bD3D)
{
if (s_aviinit)
{

26
plugins/zzogl-pg/opengl/ZZoglFlush.cpp
View File

@ -144,8 +144,8 @@ static u32 s_ptexNextSet[2] = {0}; // ZZ
vector<u32> s_vecTempTextures; // temporary textures, released at the end of every frame
extern bool s_bTexFlush;
bool s_bWriteDepth = FALSE;
bool s_bDestAlphaTest = FALSE;
bool s_bWriteDepth = false;
bool s_bDestAlphaTest = false;
int s_ClutResolve = 0; // ZZ
int g_nDepthUsed = 0; // ffx2 pal movies
int s_nWriteDepthCount = 0; // ZZ
@ -1929,9 +1929,9 @@ void ZeroGS::SetContextTarget(int context)
if ((curvb.zbuf.zbp - curvb.pdepth->fbp) != (curvb.frame.fbp - curvb.prndr->fbp) && curvb.test.zte)
ZZLog::Warn_Log("Frame and zbuf not aligned.");
curvb.bVarsSetTarg = TRUE;
curvb.bVarsSetTarg = true;
if (vb[!context].prndr != curvb.prndr) vb[!context].bVarsSetTarg = FALSE;
if (vb[!context].prndr != curvb.prndr) vb[!context].bVarsSetTarg = false;
assert(!(curvb.prndr->status&CRenderTarget::TS_NeedUpdate));
assert(curvb.pdepth == NULL || !(curvb.pdepth->status&CRenderTarget::TS_NeedUpdate));
@ -1955,20 +1955,20 @@ void ZeroGS::SetTexInt(int context, FRAGMENTSHADER* pfragment, int settexint)
if (vb[context].pmemtarg != pmemtarg)
{
SetTexVariablesInt(context, GetTexFilter(vb[context].tex1), tex0, pmemtarg, pfragment, s_bForceTexFlush);
vb[context].bVarsTexSync = TRUE;
vb[context].bVarsTexSync = true;
}
}
else
{
SetTexVariablesInt(context, GetTexFilter(vb[context].tex1), tex0, pmemtarg, pfragment, s_bForceTexFlush);
vb[context].bVarsTexSync = TRUE;
vb[context].bVarsTexSync = true;
INC_TEXVARS();
}
}
else
{
vb[context].bVarsTexSync = FALSE;
vb[context].bVarsTexSync = false;
}
}
@ -2238,7 +2238,7 @@ void ZeroGS::SetTexVariables(int context, FRAGMENTSHADER* pfragment)
SetTexClamping(context, pfragment);
vb[context].bTexConstsSync = TRUE;
vb[context].bTexConstsSync = true;
}
if (s_bTexFlush)
@ -2246,7 +2246,7 @@ void ZeroGS::SetTexVariables(int context, FRAGMENTSHADER* pfragment)
if (PSMT_ISCLUT(tex0.psm))
texClutWrite(context);
else
s_bTexFlush = FALSE;
s_bTexFlush = false;
}
}
@ -2366,7 +2366,7 @@ void ZeroGS::SetTexVariablesInt(int context, int bilinear, const tex0Info& tex0,
vb[context].pmemtarg = pmemtarg;
vb[context].bVarsTexSync = FALSE;
vb[context].bVarsTexSync = false;
}
#define SET_ALPHA_COLOR_FACTOR(sign) \
@ -2927,7 +2927,7 @@ void ZeroGS::SetWriteDepth()
if (conf.mrtdepth)
{
s_bWriteDepth = TRUE;
s_bWriteDepth = true;
s_nWriteDepthCount = 4;
}
}
@ -2947,14 +2947,14 @@ bool ZeroGS::IsWriteDestAlphaTest()
void ZeroGS::SetDestAlphaTest()
{
FUNCLOG
s_bDestAlphaTest = TRUE;
s_bDestAlphaTest = true;
s_nWriteDestAlphaTest = 4;
}
void ZeroGS::SetTexFlush()
{
FUNCLOG
s_bTexFlush = TRUE;
s_bTexFlush = true;
// if( PSMT_ISCLUT(vb[0].tex0.psm) )
// texClutWrite(0);

10
plugins/zzogl-pg/opengl/ZZoglShaders.cpp
View File

@ -310,13 +310,13 @@ bool ZeroGS::LoadExtraEffects()
LOAD_PS(SH_CRTCTARGPS, ppsCRTCTarg[0]);
LOAD_PS(SH_CRTCTARGINTERPS, ppsCRTCTarg[1]);
g_bCRTCBilinear = TRUE;
g_bCRTCBilinear = true;
LOAD_PS(SH_CRTCPS, ppsCRTC[0]);
if (!bLoadSuccess)
{
// switch to simpler
g_bCRTCBilinear = FALSE;
g_bCRTCBilinear = false;
LOAD_PS(SH_CRTC_NEARESTPS, ppsCRTC[0]);
LOAD_PS(SH_CRTCINTER_NEARESTPS, ppsCRTC[0]);
}
@ -543,13 +543,13 @@ bool ZeroGS::LoadExtraEffects()
LOAD_PS("CRTCTargPS", ppsCRTCTarg[0], cgfProf);
LOAD_PS("CRTCTargInterPS", ppsCRTCTarg[1], cgfProf);
g_bCRTCBilinear = TRUE;
g_bCRTCBilinear = true;
LOAD_PS("CRTCPS", ppsCRTC[0], cgfProf);
if (!bLoadSuccess)
{
// switch to simpler
g_bCRTCBilinear = FALSE;
g_bCRTCBilinear = false;
LOAD_PS("CRTCPS_Nearest", ppsCRTC[0], cgfProf);
LOAD_PS("CRTCInterPS_Nearest", ppsCRTC[0], cgfProf);
}
@ -569,7 +569,7 @@ bool ZeroGS::LoadExtraEffects()
// if( !conf.mrtdepth ) {
// ZZLog::Error_Log("Disabling MRT depth writing.");
// s_bWriteDepth = FALSE;
// s_bWriteDepth = false;
// }
return true;

8
plugins/zzogl-pg/opengl/ZZoglShoots.cpp
View File

@ -199,14 +199,14 @@ bool ZeroGS::SaveJPEG(const char* filename, int image_width, int image_height, c
/* Now you can set any non-default parameters you wish to.
* Here we just illustrate the use of quality (quantization table) scaling:
*/
jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */);
jpeg_set_quality(&cinfo, quality, true /* limit to baseline-JPEG values */);
/* Step 4: Start compressor */
/* TRUE ensures that we will write a complete interchange-JPEG file.
* Pass TRUE unless you are very sure of what you're doing.
/* true ensures that we will write a complete interchange-JPEG file.
* Pass true unless you are very sure of what you're doing.
*/
jpeg_start_compress(&cinfo, TRUE);
jpeg_start_compress(&cinfo, true);
/* Step 5: while (scan lines remain to be written) */
/* jpeg_write_scanlines(...); */

8
plugins/zzogl-pg/opengl/ZZoglVB.cpp
View File

@ -413,7 +413,7 @@ inline void ZeroGS::VB::FlushTexUnchangedClutDontUpdate()
{
ZeroGS::texClutWrite(ictx);
// invalidate to make sure target didn't change!
bVarsTexSync = FALSE;
bVarsTexSync = false;
}
}
@ -432,7 +432,7 @@ inline void ZeroGS::VB::FlushTexClutDontUpdate()
ZeroGS::texClutWrite(ictx);
bVarsTexSync = FALSE;
bVarsTexSync = false;
}
@ -487,8 +487,8 @@ void ZeroGS::VB::FlushTexData()
// Made the full update
ZeroGS::Flush(ictx);
bVarsTexSync = FALSE;
bTexConstsSync = FALSE;
bVarsTexSync = false;
bTexConstsSync = false;
uCurTex0Data[0] = uNextTex0Data[0];
uCurTex0Data[1] = uNextTex0Data[1];

2
plugins/zzogl-pg/opengl/targets.cpp
View File

@ -67,7 +67,7 @@ CMemoryTargetMngr g_MemTargs;
extern u32 s_ptexCurSet[2];
extern u32 ptexBilinearBlocks;
extern u32 ptexConv32to16;
BOOL g_bSaveZUpdate = 0;
bool g_bSaveZUpdate = 0;
// ------------------------- Usefull inlines ------------------------------------

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

@ -61,7 +61,7 @@ HGLRC hRC = NULL; // Permanent Rendering Context
bool g_bIsLost = 0; // ZZ
BOOL g_bMakeSnapshot = 0;
bool g_bMakeSnapshot = 0;
string strSnapshot;
CGprogram g_vsprog = 0, g_psprog = 0; // 2 -- ZZ
@ -101,7 +101,7 @@ CGparameter g_vparamPosXY[2] = {0}, g_fparamFogColor = 0;
map<int, SHADERHEADER*> mapShaderResources;
bool s_bTexFlush = FALSE;
bool s_bTexFlush = false;
int s_nLastResolveReset = 0;
int s_nWireframeCount = 0;
int s_nResolveCounts[30] = {0}; // resolve counts for last 30 frames

12
plugins/zzogl-pg/opengl/zerogs.h
View File

@ -384,11 +384,11 @@ extern u32 ptexBilinearBlocks;
extern u32 ptexConv32to16;
extern int g_MaxTexWidth, g_MaxTexHeight;
extern float g_fBlockMult;
extern BOOL g_bDisplayMsg;
extern BOOL g_bDisplayFPS;
extern bool g_bDisplayMsg;
extern bool g_bDisplayFPS;
extern int g_nDepthBias;
extern BOOL g_bSaveFlushedFrame;
extern bool g_bSaveFlushedFrame;
extern u8* s_lpShaderResources;
extern u32 g_SaveFrameNum;
extern int s_nWriteDepthCount;
@ -446,9 +446,9 @@ extern GLenum g_internalRGBAFloatFmt;
extern GLenum g_internalRGBAFloat16Fmt;
extern CGprogram g_vsprog, g_psprog;
extern BOOL g_bMakeSnapshot;
extern bool g_bMakeSnapshot;
extern string strSnapshot;
extern BOOL g_bCRTCBilinear;
extern bool g_bCRTCBilinear;
// AVI Capture
extern int s_aviinit;
@ -1013,7 +1013,7 @@ void ReloadEffects();
bool IsGLExt(const char* szTargetExtension); ///< returns true if the the opengl extension is supported
inline bool Create_Window(int _width, int _height);
bool Create(int width, int height);
void Destroy(BOOL bD3D);
void Destroy(bool bD3D);
void Restore(); // call to restore device
void Reset(); // call to destroy video resources