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

Timestamp:

Jul 3, 2002, 5:44:39 PM (23 years ago)

Author:

sandervl

Message:

MoveRect fixes (src & dest surfaces the same + overlap); fill fixes + optimizations

File:

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

trunk/src/ddraw/OS2SURFACE.CPP

@@ -1 @@
-/* $Id: OS2SURFACE.CPP,v 1.45 2002-07-02 09:55:12 sandervl Exp $ */
+/* $Id: OS2SURFACE.CPP,v 1.46 2002-07-03 15:44:37 sandervl Exp $ */
 
 /*
@@ -5975 +5975 @@
   static char Scanline[6400];  // sufficient for 1600 at 32 bit
 
+  if(sizeof(Scanline) < lPitch) {
+      DebugInt3();      //oh, oh
+      return;
+  }
   // Bridge, we may got a problem ;)
   // Check for Overlapping Rects
@@ -5981 +5985 @@
   pSrcPos = pBuffer;
 
-  if(lpDestRect->top <= lpSrcRect->top)
+  if(lpDestRect->top > lpSrcRect->top)
   {
     //  +-------+     +-------+      +-------+
-    //  |S      |     |S      |      |S      |  +---+---+---+
-    //  |   +---|---+ +-------+  +---|---+   |  |S/D|D/S|   |
-    //  |   | D |   | | D     |  | D |   |   |  |   |   |   |
-    //  +-------+   | +-------+  |   +-------+  |   |   |   |
-    //      |       | |       |  |       |      +---+---+---+
+    //  |S      |     |S      |      |S      |  
+    //  |   +---|---+ +-------+  +---|---+   |  
+    //  |   | D |   | | D     |  | D |   |   |  
+    //  +-------+   | +-------+  |   +-------+  
+    //      |       | |       |  |       |      
     //      +-------+ +-------+  +-------+
     //
     // We got one of the above cases (or no overlapping) so copy from bottom up
 
-    pBltPos += (lpDestRect->left * bpp) + lPitch * lpDestRect->top;
+    pBltPos += (lpDestRect->left * bpp) + lPitch * (lpDestRect->bottom-1);
     pSrcPos += (lpSrcRect->left * bpp)  + lPitch * (lpSrcRect->bottom-1);
     BlitHeight = lpDestRect->bottom - lpDestRect->top;
@@ -6002 +6006 @@
       memcpy(Scanline,pSrcPos,BlitWidth);
       memcpy(pBltPos,Scanline,BlitWidth);
-      pBltPos += lPitch;
+      pBltPos -= lPitch;
       pSrcPos -= lPitch;
       if(! (--BlitHeight))
@@ -6012 +6016 @@
     //  +-------+     +-------+      +-------+
     //  | D     |     | D     |      | D     |
-    //  |   +---|---+ +-------+  +---|---+   |
-    //  |   |S  |   | |S      |  |S  |   |   |
-    //  +-------+   | +-------+  |   +-------+
-    //      |       | |       |  |       |
-    //      +-------+ +-------+  +-------+
+    //  |   +---|---+ +-------+  +---|---+   |  +---+---+---+
+    //  |   |S  |   | |S      |  |S  |   |   |  |S  |S/D| D |
+    //  +-------+   | +-------+  |   +-------+  |   |   |   |
+    //      |       | |       |  |       |      |   |   |   |
+    //      +-------+ +-------+  +-------+      +---+---+---+
     //
     // We got one of the above cases so copy top down