lots of win32 port work

[picodrive.git] / platform / win32 / GenaDrive / Direct.cpp

diff --git a/platform/win32/GenaDrive/Direct.cpp b/platform/win32/GenaDrive/Direct.cpp
index 07e8747..a726acb 100644 (file)
--- a/platform/win32/GenaDrive/Direct.cpp
+++ b/platform/win32/GenaDrive/Direct.cpp
@@ -1,5 +1,6 @@
 #include "app.h"\r
 \r
+#ifdef USE_D3D\r
 // d3d\r
 static IDirect3D8 *Direct3D=NULL;\r
 IDirect3DDevice8 *Device=NULL;\r
@@ -16,6 +17,7 @@ struct CustomVertex
 #define D3DFVF_CUSTOMVERTEX (D3DFVF_XYZ|D3DFVF_DIFFUSE|D3DFVF_TEX1)\r
 \r
 static CustomVertex VertexList[4];\r
+#endif\r
 \r
 // ddraw\r
 #include <ddraw.h>\r
@@ -144,7 +146,7 @@ static int DirectClearDDraw(unsigned int colour)
 \r
 static int DirectPresentDDraw()\r
 {\r
-  int ret = m_pddsFrontBuffer->Blt(&FrameRectMy, m_pddsBackBuffer, NULL, DDBLT_WAIT, NULL);\r
+  int ret = m_pddsFrontBuffer->Blt(&FrameRectMy, m_pddsBackBuffer, &EmuScreenRect, DDBLT_WAIT, NULL);\r
   if (ret) { LOGFAIL(); return 1; }\r
   return 0;\r
 }\r
@@ -154,6 +156,7 @@ static int DirectPresentDDraw()
 \r
 int DirectInit()\r
 {\r
+#if USE_D3D\r
   D3DPRESENT_PARAMETERS d3dpp;\r
   D3DDISPLAYMODE mode;\r
   int i,u,ret=0;\r
@@ -242,14 +245,14 @@ fail0:
   RELEASE(Direct3D)\r
 \r
   // error("Failed to use Direct3D, trying DirectDraw..");\r
-\r
+#endif\r
   // try DirectDraw\r
   return DirectDrawInit();\r
 }\r
 \r
 void DirectExit()\r
 {\r
-  //FontExit();\r
+#ifdef USE_D3D\r
   TexScreenExit();\r
 \r
   // d3d\r
@@ -257,11 +260,35 @@ void DirectExit()
   RELEASE(DirectBack)\r
   RELEASE(Device)\r
   RELEASE(Direct3D)\r
-\r
+#endif\r
   DirectExitDDraw();\r
 }\r
 \r
+int DirectClear(unsigned int colour)\r
+{\r
+#ifdef USE_D3D\r
+  if (Device != NULL) {\r
+    Device->Clear(0,NULL,D3DCLEAR_TARGET,colour,1.0f,0);\r
+    return 0;\r
+  }\r
+#endif\r
 \r
+  return DirectClearDDraw(colour);\r
+}\r
+\r
+int DirectPresent()\r
+{\r
+#ifdef USE_D3D\r
+  if (Device != NULL) {\r
+    Device->Present(NULL,NULL,NULL,NULL);\r
+    return 0;\r
+  }\r
+#endif\r
+\r
+  return DirectPresentDDraw();\r
+}\r
+\r
+#ifdef USE_D3D\r
 static int MakeVertexList()\r
 {\r
   struct CustomVertex *vert=NULL,*pv=NULL;\r
@@ -303,24 +330,6 @@ static int MakeVertexList()
   return 0;\r
 }\r
 \r
-int DirectClear(unsigned int colour)\r
-{\r
-  if (Device == NULL)\r
-    return DirectClearDDraw(colour);\r
-\r
-  Device->Clear(0,NULL,D3DCLEAR_TARGET,colour,1.0f,0);\r
-  return 0;\r
-}\r
-\r
-int DirectPresent()\r
-{\r
-  if (Device == NULL)\r
-    return DirectPresentDDraw();\r
-\r
-  Device->Present(NULL,NULL,NULL,NULL);\r
-  return 0;\r
-}\r
-\r
 static int SetupMatrices()\r
 {\r
   D3DXVECTOR3 eye ( 0.0f, 0.0f, 0.0f );\r
@@ -387,3 +396,10 @@ int DirectScreen()
 \r
   return 0;\r
 }\r
+#else\r
+int DirectScreen()\r
+{\r
+  return DirectScreenDDraw();\r
+}\r
+#endif\r
+\r