summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--macosx/Pcsxr.xcodeproj/project.pbxproj5
-rwxr-xr-xmacosx/plugins/DFSound/macsrc/PluginController.m1
-rwxr-xr-xmacosx/plugins/DFXVideo/macsrc/drawgl.m36
-rwxr-xr-xplugins/peopsxgl/draw.c34
-rwxr-xr-xplugins/peopsxgl/gpu.c36
5 files changed, 58 insertions, 54 deletions
diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj
index 794fdccc..30a1923c 100644
--- a/macosx/Pcsxr.xcodeproj/project.pbxproj
+++ b/macosx/Pcsxr.xcodeproj/project.pbxproj
@@ -681,7 +681,7 @@
551A764E17868F570052D185 /* fps.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = fps.c; sourceTree = "<group>"; };
551A764F17868F570052D185 /* fps.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = fps.h; sourceTree = "<group>"; };
551A765017868F570052D185 /* gl_ext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gl_ext.h; sourceTree = "<group>"; };
- 551A765117868F570052D185 /* gpu.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gpu.c; sourceTree = "<group>"; };
+ 551A765117868F570052D185 /* gpu.c */ = {isa = PBXFileReference; indentWidth = 1; lastKnownFileType = sourcecode.c.c; path = gpu.c; sourceTree = "<group>"; usesTabs = 0; };
551A765217868F570052D185 /* gpu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gpu.h; sourceTree = "<group>"; };
551A765617868F570052D185 /* gte_accuracy.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gte_accuracy.c; sourceTree = "<group>"; };
551A765717868F570052D185 /* gte_accuracy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gte_accuracy.h; sourceTree = "<group>"; };
@@ -1682,9 +1682,11 @@
551A766217868F570052D185 /* texture.c */,
551A766317868F570052D185 /* texture.h */,
);
+ indentWidth = 1;
name = src;
path = ../../../plugins/peopsxgl;
sourceTree = "<group>";
+ usesTabs = 0;
};
551A766417868F870052D185 /* Resources */ = {
isa = PBXGroup;
@@ -3706,6 +3708,7 @@
55906B1B17C28E490057F60D /* Instrument */,
);
defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
};
71F353F30FD98DFE00CBEC28 /* Build configuration list for PBXNativeTarget "PCSXR" */ = {
isa = XCConfigurationList;
diff --git a/macosx/plugins/DFSound/macsrc/PluginController.m b/macosx/plugins/DFSound/macsrc/PluginController.m
index fa6fbc97..88d23d03 100755
--- a/macosx/plugins/DFSound/macsrc/PluginController.m
+++ b/macosx/plugins/DFSound/macsrc/PluginController.m
@@ -43,7 +43,6 @@ extern char* PLUGLOC(char* toloc);
#define PrefsKey APP_ID @" Settings"
static SPUPluginController *pluginController = nil;
-char * pConfigFile=NULL;
void DoAbout()
{
diff --git a/macosx/plugins/DFXVideo/macsrc/drawgl.m b/macosx/plugins/DFXVideo/macsrc/drawgl.m
index efccb132..3f768307 100755
--- a/macosx/plugins/DFXVideo/macsrc/drawgl.m
+++ b/macosx/plugins/DFXVideo/macsrc/drawgl.m
@@ -29,25 +29,25 @@
// misc globals
////////////////////////////////////////////////////////////////////////////////////
-int iResX;
-int iResY;
-long lLowerpart;
-BOOL bIsFirstFrame = TRUE;
-BOOL bCheckMask=FALSE;
-unsigned short sSetMask=0;
-unsigned long lSetMask=0;
-int iDesktopCol=16;
-int iShowFPS=0;
-int iWinSize;
-int iUseScanLines=0;
-int iUseNoStretchBlt=0;
-int iFastFwd=0;
-int iDebugMode=0;
-int iFVDisplay=0;
-PSXPoint_t ptCursorPoint[8];
-unsigned short usCursorActive=0;
+int iResX;
+int iResY;
+long lLowerpart;
+BOOL bIsFirstFrame = TRUE;
+BOOL bCheckMask=FALSE;
+unsigned short sSetMask=0;
+unsigned long lSetMask=0;
+int iDesktopCol=16;
+int iShowFPS=0;
+int iWinSize;
+int iUseScanLines=0;
+int iUseNoStretchBlt=0;
+int iFastFwd=0;
+int iDebugMode=0;
+int iFVDisplay=0;
+PSXPoint_t ptCursorPoint[8];
+unsigned short usCursorActive=0;
char * Xpixels;
-char * pCaptionText;
+char * pCaptionText;
//static PluginWindowController *windowController;
static PluginGLView *glView;
diff --git a/plugins/peopsxgl/draw.c b/plugins/peopsxgl/draw.c
index fd8f4c46..cb838d33 100755
--- a/plugins/peopsxgl/draw.c
+++ b/plugins/peopsxgl/draw.c
@@ -281,7 +281,7 @@ void SetExtGLFuncs(void)
}
#endif
#ifdef _MACGL
- SetVSync(iForceVSync);
+ SetVSync(iForceVSync);
#endif
if(iUseExts && !(dwActFixes&1024) && // extensions wanted? and not turned off by game fix?
strstr((char *)glGetString(GL_EXTENSIONS), // and blend_subtract available?
@@ -527,21 +527,21 @@ void CreateScanLines(void)
uiScanLine=glGenLists(1);
glNewList(uiScanLine,GL_COMPILE);
#ifdef _MACGL
- // not mac specific, just commenting out to be friendly
- // use it if you like
- // this draws anti-aliased lines with user-chosen color
- glPushAttrib(GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_CURRENT_BIT);
- glEnable(GL_BLEND | GL_LINE_SMOOTH);
- glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
- glColor4f(iScanlineColor[0],iScanlineColor[1],iScanlineColor[2],iScanlineColor[3]);
- glBegin(GL_LINES);
- for(y=0;y<iResY;y+=2)
- {
- glVertex2f(0,y);
- glVertex2f(iResX,y);
- }
- glEnd();
- glPopAttrib();
+ // not mac specific, just commenting out to be friendly
+ // use it if you like
+ // this draws anti-aliased lines with user-chosen color
+ glPushAttrib(GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_CURRENT_BIT);
+ glEnable(GL_BLEND | GL_LINE_SMOOTH);
+ glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
+ glColor4f(iScanlineColor[0],iScanlineColor[1],iScanlineColor[2],iScanlineColor[3]);
+ glBegin(GL_LINES);
+ for(y=0;y<iResY;y+=2)
+ {
+ glVertex2f(0,y);
+ glVertex2f(iResX,y);
+ }
+ glEnd();
+ glPopAttrib();
#else
for(y=0;y<iResY;y+=2)
{
@@ -580,7 +580,7 @@ int GLinitialize()
if(bWindowMode) ReleaseDC(hWWindow,dcGlobal); // win mode: release dc again
#endif
#if defined (_MACGL)
- BringContextForward();
+ BringContextForward();
#endif
glViewport(rRatioRect.left, // init viewport by ratio rect
iResY-(rRatioRect.top+rRatioRect.bottom),
diff --git a/plugins/peopsxgl/gpu.c b/plugins/peopsxgl/gpu.c
index d022d19e..fe5ed09f 100755
--- a/plugins/peopsxgl/gpu.c
+++ b/plugins/peopsxgl/gpu.c
@@ -1062,7 +1062,9 @@ extern char * pCaptionText;
long GPUopen(unsigned long * disp,char * CapText,char * CfgFile)
{
pCaptionText=CapText;
+#if !defined (_MACGL)
pConfigFile=CfgFile;
+#endif
ReadConfig(); // read text file for config
@@ -1070,11 +1072,11 @@ long GPUopen(unsigned long * disp,char * CapText,char * CfgFile)
bIsFirstFrame = TRUE; // we have to init later (well, no really... in Linux we do all in GPUopen)
- #if defined (_MACGL)
+#if defined (_MACGL)
unsigned long display = ulInitDisplay();
- #else
+#else
sysdep_create_display(); // create display
- #endif
+#endif
InitializeTextureStore(); // init texture mem
@@ -1086,11 +1088,11 @@ long GPUopen(unsigned long * disp,char * CapText,char * CfgFile)
if(disp)
{
- #if defined (_MACGL)
- *disp = display;
- #else
+#if defined (_MACGL)
+ *disp = display;
+#else
*disp=(unsigned long *)display; // return display ID to main emu
- #endif
+#endif
}
if(display) return 0;
@@ -1135,11 +1137,11 @@ long GPUclose() // LINUX CLOSE
if(pGfxCardScreen) free(pGfxCardScreen); // free helper memory
pGfxCardScreen=0;
- #if defined (_MACGL)
+#if defined (_MACGL)
CloseDisplay();
- #else
+#else
osd_close_display(); // destroy display
- #endif
+#endif
return 0;
}
@@ -1470,7 +1472,7 @@ void updateDisplay(void) // UPDATE DISPLAY
wglMakeCurrent(hdc,GLCONTEXT); // -> make context current again
#endif
#if defined (_MACGL)
- BringContextForward();
+ BringContextForward();
#endif
bFakeFrontBuffer=FALSE;
bRenderFrontBuffer=FALSE;
@@ -1562,7 +1564,7 @@ void updateDisplay(void) // UPDATE DISPLAY
#ifdef _WINDOWS
SwapBuffers(wglGetCurrentDC()); // -> to skip or not to skip
#elif defined(_MACGL)
- DoBufferSwap();
+ DoBufferSwap();
#else
glXSwapBuffers(display,window);
#endif
@@ -1581,7 +1583,7 @@ void updateDisplay(void) // UPDATE DISPLAY
#ifdef _WINDOWS
SwapBuffers(wglGetCurrentDC()); // -> swap
#elif defined(_MACGL)
- DoBufferSwap();
+ DoBufferSwap();
#else
glXSwapBuffers(display,window);
#endif
@@ -1707,9 +1709,9 @@ void updateFrontDisplay(void)
ReleaseDC(hWWindow,hdc); // -> ! important !
}
#elif defined (_MACGL)
-if (iDrawnSomething){
- DoBufferSwap();
- }
+ if (iDrawnSomething){
+ DoBufferSwap();
+ }
#else
if(iDrawnSomething) // linux:
glXSwapBuffers(display,window);
@@ -3146,7 +3148,7 @@ void CALLBACK GPUabout(void)
HWND hWP=GetActiveWindow(); // to be sure
DialogBox(hInst,MAKEINTRESOURCE(IDD_DIALOG_ABOUT), hWP,(DLGPROC)AboutDlgProc);
#elif defined(_MACGL)
- AboutDlgProc();
+ AboutDlgProc();
#else
StartCfgTool("about");
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-04 14:47:15 +0000