diff --git a/plugins/peopsxgl/draw.c b/plugins/peopsxgl/draw.c index c60d9379..357348f2 100644 --- a/plugins/peopsxgl/draw.c +++ b/plugins/peopsxgl/draw.c @@ -131,7 +131,7 @@ BOOL bGteAccuracy; // OGL extension support int iForceVSync=-1; -int iUseExts=0; +int iUseExts=1; BOOL bGLExt; BOOL bGLFastMovie=FALSE; BOOL bGLSoft; diff --git a/win32/plugins/peopsxgl/gpuPeopsOpenGL.rc b/win32/plugins/peopsxgl/gpuPeopsOpenGL.rc index a8e877da..e0d218c5 100644 --- a/win32/plugins/peopsxgl/gpuPeopsOpenGL.rc +++ b/win32/plugins/peopsxgl/gpuPeopsOpenGL.rc @@ -178,13 +178,13 @@ BEGIN CONTROL "Disable screensaver",IDC_SSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,258,81,10 CONTROL "Special game fixes",IDC_GAMEFIX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,268,75,10 PUSHBUTTON "...",IDC_SELFIX,93,268,11,10,0,WS_EX_STATICEDGE - PUSHBUTTON "Fast",IDC_DEF1,14,309,34,14 - PUSHBUTTON "Nice",IDC_DEF2,53,309,34,14 - DEFPUSHBUTTON "OK",IDOK,117,309,84,14 - PUSHBUTTON "Cancel",IDCANCEL,219,309,84,14 - PUSHBUTTON "Copy settings\n to clipboard",IDC_CLIPBOARD,319,298,87,25,BS_MULTILINE,WS_EX_STATICEDGE - GROUPBOX "Misc",IDC_STATIC,7,184,406,108 - GROUPBOX "Default settings",IDC_STATIC,7,293,88,30 + PUSHBUTTON "Fast",IDC_DEF1,14,321,34,14 + PUSHBUTTON "Nice",IDC_DEF2,53,321,34,14 + DEFPUSHBUTTON "OK",IDOK,117,321,84,14 + PUSHBUTTON "Cancel",IDCANCEL,219,321,84,14 + PUSHBUTTON "Copy settings\n to clipboard",IDC_CLIPBOARD,319,310,87,25,BS_MULTILINE,WS_EX_STATICEDGE + GROUPBOX "Misc",IDC_STATIC,7,184,406,118 + GROUPBOX "Default settings",IDC_STATIC,7,305,88,30 GROUPBOX "Textures",IDC_STATIC,3,41,406,40 RTEXT "Desktop resolution:",IDC_STATIC,81,12,65,9 GROUPBOX "Resolution && Colors",IDC_STATIC,3,1,406,40 @@ -208,7 +208,7 @@ BEGIN LTEXT "Correct opaque texture areas",IDC_STATIC,302,127,97,9,SS_CENTERIMAGE LTEXT "Needed by a few games",IDC_STATIC,302,138,97,9,SS_CENTERIMAGE RTEXT "Scanline brightness (0...255, -1=Monitor dot matrix):",IDC_STATIC,214,198,162,9,SS_CENTERIMAGE - EDITTEXT IDC_CLPEDIT,318,311,6,12,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | NOT WS_VISIBLE + EDITTEXT IDC_CLPEDIT,318,323,6,12,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | NOT WS_VISIBLE LTEXT "MBytes",IDC_QUALTXT3,340,65,27,9 LTEXT "The complete screen will get smoothed. Very slow on some cards, lotta vram needed",IDC_STATIC,139,248,269,9,SS_CENTERIMAGE RTEXT "Framebuffer access:",IDC_STATIC,7,150,68,10,SS_CENTERIMAGE @@ -217,11 +217,13 @@ BEGIN RTEXT "Hi-Res textures:",IDC_QUALTXT4,223,52,50,9 COMBOBOX IDC_VSYNC,261,24,36,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP RTEXT "V-Sync:",IDC_STATIC,219,26,39,9,SS_CENTERIMAGE - CONTROL "Gte accuracy",IDC_GTEACCURACY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,278,59,10 - LTEXT "Higher GTE precision that can improve vertex positioning (ie less polygon shaking)",IDC_STATIC,139,278,262,9,SS_CENTERIMAGE + CONTROL "Gte accuracy",IDC_GTEACCURACY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,287,59,10 + LTEXT "Higher GTE precision that can improve vertex positioning (ie less polygon shaking)",IDC_STATIC,139,287,256,9,SS_CENTERIMAGE CONTROL "Force 4:3 aspect ratio",IDC_ARATIO43,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,306,25,95,12 COMBOBOX IDC_LINEHACK,78,162,130,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP RTEXT "Line Hack Mode",IDC_STATIC,7,163,68,10,SS_CENTERIMAGE + CONTROL "Use extensions",IDC_USEEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,278,59,10 + LTEXT "Use OpenGL extensions (Recommended)",IDC_STATIC,139,278,162,9,SS_CENTERIMAGE END IDD_FIXES DIALOG 0, 0, 316, 322 @@ -314,7 +316,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 406 TOPMARGIN, 7 - BOTTOMMARGIN, 323 + BOTTOMMARGIN, 335 END IDD_FIXES, DIALOG diff --git a/win32/plugins/peopsxgl/resource.h b/win32/plugins/peopsxgl/resource.h index 8d10b7bb..b937f932 100644 --- a/win32/plugins/peopsxgl/resource.h +++ b/win32/plugins/peopsxgl/resource.h @@ -87,6 +87,7 @@ #define IDC_QUALTXT4 1063 #define IDC_GAMEFIX2 1064 #define IDC_GTEACCURACY 1065 +#define IDC_USEEXT 1066 #define IDC_F14_STATIC3 1083 #define IDC_F14_STATIC4 1084 #define IDC_F14_STATIC5 1085 diff --git a/win32/plugins/peopsxgl/winsrc/cfg.c b/win32/plugins/peopsxgl/winsrc/cfg.c index 37f8139f..68935fe6 100644 --- a/win32/plugins/peopsxgl/winsrc/cfg.c +++ b/win32/plugins/peopsxgl/winsrc/cfg.c @@ -179,6 +179,7 @@ BOOL OnInitCfgDialog(HWND hW) // INIT CONFIG DIALOG if(bUse15bitMdec) CheckDlgButton(hW,IDC_FASTMDEC2,TRUE); if(bUseFixes) CheckDlgButton(hW,IDC_GAMEFIX,TRUE); if(bGteAccuracy) CheckDlgButton(hW,IDC_GTEACCURACY,TRUE); + if(iUseExts) CheckDlgButton(hW,IDC_USEEXT, TRUE); if(iUseScanLines) CheckDlgButton(hW,IDC_USESCANLINES,TRUE); if(iShowFPS) CheckDlgButton(hW,IDC_SHOWFPS,TRUE); if(bKeepRatio) CheckDlgButton(hW,IDC_ARATIO,TRUE); @@ -340,6 +341,9 @@ void GetSettings(HWND hW) if(IsDlgButtonChecked(hW,IDC_GTEACCURACY)) bGteAccuracy=TRUE; else bGteAccuracy=FALSE; + if(IsDlgButtonChecked(hW, IDC_USEEXT)) + iUseExts = TRUE; else iUseExts = FALSE; + if(IsDlgButtonChecked(hW,IDC_USESCANLINES)) iUseScanLines=1; else iUseScanLines=0; @@ -627,6 +631,7 @@ void ReadConfig(void) // read all config vals dwCfgFixes=0; bUseFixes=FALSE; bGteAccuracy=FALSE; + iUseExts=TRUE; iUseScanLines=0; iFrameTexType=0; iFrameReadType=0; @@ -731,6 +736,9 @@ void ReadConfig(void) // read all config vals if(RegQueryValueEx(myKey,"GteAccuracy",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS) bGteAccuracy=(BOOL)temp; size = 4; + if(RegQueryValueEx(myKey,"UseExtensions",0,&type,(LPBYTE)&temp, &size)==ERROR_SUCCESS) + iUseExts = (BOOL)temp; + size = 4; if(RegQueryValueEx(myKey,"UseMask",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS) iUseMask=(int)temp; size = 4; @@ -881,6 +889,8 @@ void WriteConfig(void) RegSetValueEx(myKey,"UseFixes",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp)); temp=bGteAccuracy; RegSetValueEx(myKey,"GteAccuracy",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp)); + temp = iUseExts; + RegSetValueEx(myKey,"UseExtensions",0,REG_DWORD,(LPBYTE)&temp,sizeof(temp)); temp=iUseMask; RegSetValueEx(myKey,"UseMask",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp)); temp=bUseFastMdec;