Changeset 5443

Timestamp:

Apr 2, 2001, 8:21:10 PM (24 years ago)

Author:

sandervl

Message:

back buffer fix

File:

• trunk/src/ddraw/OS2SURFACE.CPP (modified) (6 diffs)

trunk/src/ddraw/OS2SURFACE.CPP ¶

@@ -1 @@
-/* $Id: OS2SURFACE.CPP,v 1.30 2001-03-28 16:21:06 sandervl Exp $ */
+/* $Id: OS2SURFACE.CPP,v 1.31 2001-04-02 18:21:10 sandervl Exp $ */
 
 /*
@@ -1320 +1320 @@
           dprintf(("DDRAW: Backbuffer # = %d\n",DDSurfaceDesc.dwBackBufferCount));
 
+#if 1
+          memset( &ComplexSurfaceDesc,
+                  0,
+                  sizeof(DDSURFACEDESC2));
+
+          ComplexSurfaceDesc.dwSize  = sizeof(DDSURFACEDESC2);
+          ComplexSurfaceDesc.dwFlags = DDSD_CAPS |
+                                       DDSD_WIDTH |
+                                       DDSD_HEIGHT |
+                                       DDSD_PIXELFORMAT;
+          ComplexSurfaceDesc.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER | DDSCAPS_FLIP;
+          ComplexSurfaceDesc.dwHeight = DDSurfaceDesc.dwHeight;
+          ComplexSurfaceDesc.dwWidth = DDSurfaceDesc.dwWidth;
+          ComplexSurfaceDesc.ddpfPixelFormat.dwFlags = DDSurfaceDesc.ddpfPixelFormat.dwFlags;
+          ComplexSurfaceDesc.ddpfPixelFormat.dwRBitMask = DDSurfaceDesc.ddpfPixelFormat.dwRBitMask;
+          ComplexSurfaceDesc.ddpfPixelFormat.dwGBitMask = DDSurfaceDesc.ddpfPixelFormat.dwGBitMask;
+          ComplexSurfaceDesc.ddpfPixelFormat.dwBBitMask = DDSurfaceDesc.ddpfPixelFormat.dwBBitMask;
+          ComplexSurfaceDesc.ddpfPixelFormat.dwRGBBitCount = DDSurfaceDesc.ddpfPixelFormat.dwRGBBitCount;
+
+          if(DDSurfaceDesc.dwBackBufferCount>1)
+          {
+            ComplexSurfaceDesc.dwFlags |=DDSD_BACKBUFFERCOUNT;
+            ComplexSurfaceDesc.dwBackBufferCount = DDSurfaceDesc.dwBackBufferCount -1;
+            ComplexSurfaceDesc.ddsCaps.dwCaps|= DDSCAPS_COMPLEX;
+          }
+
+          BackBuffer = new OS2IDirectDrawSurface(lpDraw, &ComplexSurfaceDesc, TRUE, TRUE);
+          BackBuffer->Vtbl.AddRef((IDirectDrawSurface *)BackBuffer);
+
+          if (BackBuffer->GetLastError()==DD_OK)
+          {
+            dprintf(("DDRAW: created backbuffer"));
+            DDSurfaceDesc.dwFlags |= DDSCAPS_FLIP;
+            BackBuffer->SetFrontBuffer(this);
+          }
+          else
+          {
+            dprintf(("DDRAW: Error creating backbuffer"));
+          }
+#else
           memcpy( &ComplexSurfaceDesc,
                   &DDSurfaceDesc,
@@ -1336 +1376 @@
             ComplexSurfaceDesc.ddsCaps.dwCaps &= ~DDSCAPS_COMPLEX;
           }
-
           BackBuffer = new OS2IDirectDrawSurface(lpDraw, &ComplexSurfaceDesc, TRUE, Mainchain);
           BackBuffer->Vtbl.AddRef((IDirectDrawSurface *)BackBuffer);
@@ -1345 +1384 @@
             BackBuffer->SetFrontBuffer(this);
           }
-
+#endif
         }
 
@@ -4476 +4515 @@
   dprintf(("DDRAW: SurfLock %d %08X %d %d\n", (int)lpRect, (int)lpSurfaceDesc, dwFlags, hEvent));
 
-  if((NULL==lpSurfaceDesc)||(NULL!=hEvent))
+  if((NULL==lpSurfaceDesc)|| ((dwFlags & DDLOCK_EVENT) && NULL != hEvent))
     return DDERR_INVALIDPARAMS;
 
-  if(lpSurfaceDesc->dwSize != sizeof(DDSURFACEDESC))
+  if(lpSurfaceDesc->dwSize != sizeof(DDSURFACEDESC) && lpSurfaceDesc->dwSize != sizeof(DDSURFACEDESC2))
     return DDERR_INVALIDPARAMS;
 
@@ -4493 +4532 @@
     memcpy( (char*)lpSurfaceDesc,
             (char*)&SurfaceDesc4,
-            sizeof(DDSURFACEDESC) );
+            lpSurfaceDesc->dwSize );
   }