diff options
| author | iCatButler <i.am.catbutler@gmail.com> | 2018-03-19 07:39:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-19 07:39:08 +0000 |
| commit | 6f76041029393c6823973a29426b28c8c2d0b064 (patch) | |
| tree | 13c1bb5215c2510a7c430b59bc22df666cd2fbf3 /plugins/peopsxgl/gpu.c | |
| parent | 768332417644451d38ce1a737465656c7cc75de3 (diff) | |
| parent | 128d6afb179756513860187cf5e31d84d6d8cac4 (diff) | |
| download | pcsxr-6f76041029393c6823973a29426b28c8c2d0b064.tar.gz | |
Merge pull request #7 from loathingKernel/sync-with-codeplex
Sync with codeplex
Diffstat (limited to 'plugins/peopsxgl/gpu.c')
| -rwxr-xr-x | plugins/peopsxgl/gpu.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/plugins/peopsxgl/gpu.c b/plugins/peopsxgl/gpu.c index c19dd2b6..12c453b5 100755 --- a/plugins/peopsxgl/gpu.c +++ b/plugins/peopsxgl/gpu.c @@ -35,6 +35,10 @@ static int iOldMode=0; #endif +#if defined(__linux__) +#include <sys/wait.h> +#endif + #define _IN_GPU #include "externals.h" @@ -1088,13 +1092,7 @@ long GPUopen(unsigned long * disp,char * CapText,char * CfgFile) GLinitialize(); // init opengl if(disp) - { -#if defined (_MACGL) - *disp = display; -#else - *disp=(unsigned long *)display; // return display ID to main emu -#endif - } + *disp = (unsigned long)display; // return display ID to main emu if(display) return 0; return -1; @@ -1317,7 +1315,6 @@ void SetScanLines(void) //PGXP_SetMatrix(0, PSXDisplay.DisplayMode.x, PSXDisplay.DisplayMode.y, 0, -1, 1); - if(bKeepRatio) glViewport(rRatioRect.left, iResY-(rRatioRect.top+rRatioRect.bottom), @@ -1895,7 +1892,6 @@ void updateDisplayIfChanged(void) // PGXP_SetMatrix(0, PSXDisplay.DisplayModeNew.x, PSXDisplay.DisplayModeNew.y, 0, -1, 1); - if(bKeepRatio) SetAspectRatio(); } |