dfxvideo, peopsxgl: ode bit fix (Cosmowarrior Rei/iS - Internal Section).

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@57994 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 88 insertions, 87 deletions

diff --git a/plugins/dfxvideo/externals.h b/plugins/dfxvideo/externals.h
index 9ed2b40c..5a991849 100644
--- a/plugins/dfxvideo/externals.h
+++ b/plugins/dfxvideo/externals.h
@@ -51,40 +51,40 @@
 
 #define GPUIsNotReadyForCommands (lGPUstatusRet &= ~GPUSTATUS_READYFORCOMMANDS)
 #define GPUIsReadyForCommands (lGPUstatusRet |= GPUSTATUS_READYFORCOMMANDS)
-

-#ifdef _WINDOWS

-

-#ifndef  STRICT

-#define  STRICT

-#endif

-#define  D3D_OVERLOADS

-#define  DIRECT3D_VERSION 0x600

-#define  CINTERFACE

-#ifndef  WINVER

-#define  WINVER 0x0500

-#endif

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include <stdarg.h>

-#include <stdint.h>

-#include <windows.h>

-#include <windowsx.h>

-#include <tchar.h>

-#include "resource.h"

-

-#include "ddraw.h"

-#include "d3dtypes.h"

-#include "d3d.h"

-

-#ifdef _MSC_VER

-#pragma warning (disable:864)

-#pragma warning (disable:4244)

-#pragma warning (disable:4996)

-#endif

-

-#else

+
+#ifdef _WINDOWS
+
+#ifndef  STRICT
+#define  STRICT
+#endif
+#define  D3D_OVERLOADS
+#define  DIRECT3D_VERSION 0x600
+#define  CINTERFACE
+#ifndef  WINVER
+#define  WINVER 0x0500
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <windows.h>
+#include <windowsx.h>
+#include <tchar.h>
+#include "resource.h"
+
+#include "ddraw.h"
+#include "d3dtypes.h"
+#include "d3d.h"
+
+#ifdef _MSC_VER
+#pragma warning (disable:864)
+#pragma warning (disable:4244)
+#pragma warning (disable:4996)
+#endif
+
+#else
 
 #define __X11_C_
 //X11 render
@@ -102,8 +102,8 @@
 #include <math.h>
 #include <X11/cursorfont.h>
 #include <stdint.h>
-

-#endif

+
+#endif
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -139,21 +139,21 @@ typedef struct PSXRECTTAG
  short y0;
  short y1;
 } PSXRect_t;
-

-#ifdef _WINDOWS

-

-typedef struct SDXTAG

-{

- LPDIRECTDRAW                   DD;

-

- LPDIRECTDRAWSURFACE            DDSPrimary;

- LPDIRECTDRAWSURFACE            DDSRender;

- LPDIRECTDRAWSURFACE            DDSHelper;

- LPDIRECTDRAWSURFACE            DDSScreenPic;

- HWND                           hWnd;

-} sDX;

-

-#else

+
+#ifdef _WINDOWS
+
+typedef struct SDXTAG
+{
+ LPDIRECTDRAW                   DD;
+
+ LPDIRECTDRAWSURFACE            DDSPrimary;
+ LPDIRECTDRAWSURFACE            DDSRender;
+ LPDIRECTDRAWSURFACE            DDSHelper;
+ LPDIRECTDRAWSURFACE            DDSScreenPic;
+ HWND                           hWnd;
+} sDX;
+
+#else
 
 // linux defines for some windows stuff
 
@@ -206,26 +206,26 @@ typedef struct PSXDISPLAYTAG
 
 } PSXDisplay_t;
 
-#ifdef _WINDOWS

-extern HINSTANCE hInst;

-extern HMODULE hDDrawDLL;

-#endif

+#ifdef _WINDOWS
+extern HINSTANCE hInst;
+extern HMODULE hDDrawDLL;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
 
-/////////////////////////////////////////////////////////////////////////////

-

 // draw.c
 
 #ifndef _IN_DRAW
 
-#ifdef _WINDOWS

-extern sDX            DX;

-extern HWND           hWGPU; 

-extern GUID           guiDev; 

-extern int            iRefreshRate;

-extern BOOL           bVsync;

-extern BOOL           bVsync_Key;

-#else

-extern char *         pCaptionText;

+#ifdef _WINDOWS
+extern sDX            DX;
+extern HWND           hWGPU; 
+extern GUID           guiDev; 
+extern int            iRefreshRate;
+extern BOOL           bVsync;
+extern BOOL           bVsync_Key;
+#else
+extern char *         pCaptionText;
 #endif
 
 extern int            iResX;
@@ -244,9 +244,9 @@ extern short          g_m1;
 extern short          g_m2;
 extern short          g_m3;
 extern short          DrawSemiTrans;
-extern int            iUseGammaVal;

-#ifdef _WINDOWS

-extern int            iUseScanLines;

+extern int            iUseGammaVal;
+#ifdef _WINDOWS
+extern int            iUseScanLines;
 #endif
 extern int            iMaintainAspect;
 extern int            iDesktopCol;
@@ -256,11 +256,11 @@ extern int            iFastFwd;
 extern int            iDebugMode;
 extern int            iFVDisplay;
 extern PSXPoint_t     ptCursorPoint[];
-extern unsigned short usCursorActive;

+extern unsigned short usCursorActive;
 
-#ifdef _WINDOWS

-extern int            iSysMemory;

-#endif

+#ifdef _WINDOWS
+extern int            iSysMemory;
+#endif
 
 #endif
 
@@ -324,6 +324,7 @@ extern BOOL           bInitCap;
 extern DWORD          dwLaceCnt;
 extern uint32_t  lGPUInfoVals[];
 extern uint32_t  ulStatusControl[];
+extern uint32_t  vBlank;
 
 #endif
 
@@ -332,12 +333,12 @@ extern uint32_t  ulStatusControl[];
 #ifndef _IN_MENU
 
 extern uint32_t dwCoreFlags;
-

-#ifdef _WINDOWS

-extern HFONT hGFont;

-extern int   iMPos;

-extern BOOL  bTransparent;

-#endif

+
+#ifdef _WINDOWS
+extern HFONT hGFont;
+extern int   iMPos;
+extern BOOL  bTransparent;
+#endif
 
 #endif
 
@@ -345,12 +346,12 @@ extern BOOL  bTransparent;
 
 #ifndef _IN_KEY
 
-extern unsigned long  ulKeybits;

+extern unsigned long  ulKeybits;
 
-#ifdef _WINDOWS

-extern char           szGPUKeys[];

+#ifdef _WINDOWS
+extern char           szGPUKeys[];
 #endif
-

+
 #endif
 
 // fps.c
@@ -364,10 +365,10 @@ extern int            iFrameLimit;
 extern float          fFrameRateHz;
 extern float          fps_skip;
 extern float          fps_cur;
-#ifdef _WINDOWS

-extern BOOL           IsPerformanceCounter;

-extern int			  iStopSaver;

-#endif

+#ifdef _WINDOWS
+extern BOOL           IsPerformanceCounter;
+extern int			  iStopSaver;
+#endif
 
 #endif