Changeset 2987 for trunk/src/ddraw/OS2SURFACE.CPP

Timestamp:

Mar 3, 2000, 8:21:26 PM (26 years ago)

Author:

hugh

Message:

Bugfixes for moorhuhn

File:

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

trunk/src/ddraw/OS2SURFACE.CPP

@@ -1 @@
-/* $Id: OS2SURFACE.CPP,v 1.23 2000-02-04 19:31:24 hugh Exp $ */
+/* $Id: OS2SURFACE.CPP,v 1.24 2000-03-03 19:21:24 hugh Exp $ */
 
 /*
@@ -1242 +1242 @@
           dwPitchFB = DDSurfaceDesc.dwWidth * (dwBpp<8?1:dwBpp/8);
           dwPitchFB = (dwPitchFB +7) & ~7;  // Align on QWords
+          DDSurfaceDesc.lPitch = dwPitchFB;
           #ifdef DEBUG
             if(dwBpp<8)
@@ -2191 +2192 @@
 
   #ifdef DEBUG
+    dprintf(("DDRAW: SurfBlt4 To Surf %08X, from Surf %08X\n",dest,src));
     if ( (NULL!=lpDestRect)&& (NULL!=lpSrcRect))
       dprintf(("DDRAW: SurfBlt4 to (%d,%d)(%d,%d) at %08X from (%d,%d)(%d,%d) at %08X\n", lpDestRect->left, lpDestRect->top,
@@ -3838 +3840 @@
   if(-1 != me->diveBufNr)
   {
-    dprintf(("DDRAW: DIVE Flipchain DiveBuffer #%d",FlipSurface->diveBufNr));
+    //dprintf(("DDRAW: DIVE Flipchain DiveBuffer #%d",FlipSurface->diveBufNr));
 
     // we got some DIVE surfaces
@@ -3845 +3847 @@
     // Doulebuffering should work best.
 
-    rc = DiveBlitImage(me->hDive, FlipSurface->diveBufNr, me->diveBufNr);
-
-    #ifdef DEBUG
-      dprintf(("DDRAW: DiveBlitImage rc = 0x%08X\n"));
-    #endif
+    //rc = DiveBlitImage(me->hDive, FlipSurface->diveBufNr, me->diveBufNr);
+    //dprintf(("DDRAW: DiveBlitImage rc = 0x%08X\n"));
+    SurfBltFast4( me,
+                  0,
+                  0,
+                  (LPDIRECTDRAWSURFACE4)FlipSurface,
+                  NULL,
+                  DDBLTFAST_NOCOLORKEY);
 
     if(NULL==lpDDSurf)
@@ -3855 +3860 @@
       // advance in the flipchain if no valid override surface was passed in
       // if we reached the end of the flipchain The Frontbuffer is the next to flip to
-      me->NextFlip = FlipSurface->BackBuffer!=NULL?FlipSurface->BackBuffer:me;//me->FrontBuffer;
+      me->NextFlip = FlipSurface->BackBuffer!=NULL?FlipSurface->BackBuffer:me->BackBuffer;
     }
   }