From 3480eebf5552abfc29d20ccfb8d78e04d5e342f2 Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Wed, 21 Aug 2013 23:32:19 +0000
Subject: Fix compiling issue. A few indentation changes in the Mac section of
 the XGL plug-in.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86809 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 plugins/peopsxgl/draw.c | 34 +++++++++++++++++-----------------
 plugins/peopsxgl/gpu.c  | 36 +++++++++++++++++++-----------------
 2 files changed, 36 insertions(+), 34 deletions(-)

(limited to 'plugins/peopsxgl')

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
-- 
cgit v1.2.3