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

Timestamp:

Oct 5, 2001, 2:33:10 PM (24 years ago)

Author:

sandervl

Message:

updates for stretch blitting

File:

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

trunk/src/ddraw/OS2SURFACE.CPP

@@ -1 @@
-/* $Id: OS2SURFACE.CPP,v 1.34 2001-10-03 13:49:40 sandervl Exp $ */
+/* $Id: OS2SURFACE.CPP,v 1.35 2001-10-05 12:33:09 sandervl Exp $ */
 
 /*
@@ -566 +566 @@
   OS2IDirectDrawSurface *MipMapSurface;
 
+  memset(&sBlt, 0, sizeof(sBlt));
+
   lpVtbl                     = &Vtbl2;
   lpVtbl2                    = &Vtbl2;
@@ -706 +708 @@
   memcpy((char *)&DDSurfaceDesc, (char *)lpDDSurfaceDesc, sizeof(DDSURFACEDESC2));
 
+#ifdef DEBUG
+  dprintf(("Pixel format:"));
+  _dump_pixelformat(&lpDDSurfaceDesc->ddpfPixelFormat);
+  dprintf(("Capabilities"));
+  _dump_DDSCAPS(lpDDSurfaceDesc->ddsCaps.dwCaps);
+  _dump_DDSCAPS2(lpDDSurfaceDesc->ddsCaps.dwCaps2);
+#endif
+
   if(lpDraw->dCaps.ulDepth != 15)
   {
@@ -1293 +1303 @@
           }
 
-          if(Mainchain)
-          {
-            diveBufNr = 0;
-            rc = DiveAllocImageBuffer( hDive,
+//          if(Mainchain)
+//          {
+              diveBufNr = 0;
+              rc = DiveAllocImageBuffer( hDive,
                                        &diveBufNr,
                                        lpDraw->dCaps.fccColorEncoding,
@@ -1303 +1313 @@
                                        dwPitchDB,
                                        (PBYTE)pDiveBuffer);
-             dprintf(("DDRAW: rc = 0x%08X\n",rc));
-          }
+              dprintf(("DDRAW: DiveAllocImageBuffer %x -> %d (rc=%d)",pDiveBuffer, diveBufNr, rc));
+//          }
 
         }  // end of 3rd case
@@ -2376 +2386 @@
   delete pIRectSrc;
 
+  if(dest->diveBufNr == DIVE_BUFFER_SCREEN &&
+     !(dwFlags & (DDBLT_COLORFILL|DDBLT_DEPTHFILL|DDBLT_ROP) ) )
+  {
+      int rc, temp, fChanged = FALSE;
+      int destheight = RECT_HEIGHT(&DestRect);
+      int destwidth  = RECT_WIDTH(&DestRect);
+      int srcheight  = RECT_HEIGHT(&SrcRect);
+      int srcwidth   = RECT_WIDTH(&SrcRect);
+
+      //if full surface blit or stretching blit, then use Dive
+      if( (src->DDSurfaceDesc.dwHeight == srcheight &&
+           src->DDSurfaceDesc.dwWidth  == srcwidth) ||
+          (srcwidth != destwidth && srcheight != destheight) )  
+      {
+          SETUP_BLITTER          sBlt = {0};
+
+          sBlt.ulStructLen       = sizeof(sBlt);
+          sBlt.fInvert           = 0;
+          sBlt.fccSrcColorFormat = src->DDSurfaceDesc.ddpfPixelFormat.dwFourCC;
+          sBlt.ulSrcWidth        = srcwidth;
+          sBlt.ulSrcHeight       = srcheight;
+          sBlt.ulSrcPosX         = SrcRect.left;
+          sBlt.ulSrcPosY         = src->DDSurfaceDesc.dwHeight-SrcRect.bottom;
+          sBlt.ulDitherType      = 0;
+          sBlt.fccDstColorFormat = dest->DDSurfaceDesc.ddpfPixelFormat.dwFourCC;
+          sBlt.ulDstWidth        = destwidth;
+          sBlt.ulDstHeight       = destheight;
+          sBlt.lDstPosX          = 0;
+          sBlt.lDstPosY          = 0;
+          sBlt.lScreenPosX       = DestRect.left;
+          sBlt.lScreenPosY       = dest->DDSurfaceDesc.dwHeight-DestRect.bottom;
+          sBlt.ulNumDstRects     = DIVE_FULLY_VISIBLE;
+          sBlt.pVisDstRects      = NULL;
+
+          if(dest->lpClipper && dest->lpClipper->IsClipListChangedInt()) 
+          {
+              DWORD rgnsize;
+              if(ClipGetClipList((IDirectDrawClipper*)dest->lpClipper, NULL, NULL, &rgnsize) == DD_OK) 
+              {
+                  LPRGNDATA lpRgnData = (LPRGNDATA)alloca(rgnsize);
+                  if(lpRgnData == NULL) {
+                      DebugInt3();
+                      goto dodiveblit;
+                  }
+                  if(ClipGetClipList((IDirectDrawClipper*)dest->lpClipper, NULL, lpRgnData, &rgnsize) == DD_OK) 
+                  {
+                      OS2RECTL *pRectl = (OS2RECTL *)&lpRgnData->Buffer;
+
+                      if(sBlt.ulNumDstRects == 0) {
+                          dprintf(("empty cliplist, return"));
+                          return DD_OK;
+                      }
+                      for(i=0;i<lpRgnData->rdh.nCount;i++) 
+                      {
+                          temp               = pRectl[i].yTop;
+                          pRectl[i].yTop     = dest->DDSurfaceDesc.dwHeight - pRectl[i].yBottom;
+                          pRectl[i].yBottom  = dest->DDSurfaceDesc.dwHeight - temp;
+                          //clip rectangle must be relative to lScreenPos
+                          pRectl[i].xLeft   -= sBlt.lScreenPosX;
+                          pRectl[i].xRight  -= sBlt.lScreenPosX;
+                          pRectl[i].yTop    -= sBlt.lScreenPosY;
+                          pRectl[i].yBottom -= sBlt.lScreenPosY;
+                      }
+                      fChanged = TRUE;
+                      sBlt.ulNumDstRects = lpRgnData->rdh.nCount;
+                      sBlt.pVisDstRects  = (PRECTL)&lpRgnData->Buffer;
+                  }
+              }
+          }
+dodiveblit:
+          if(fChanged || memcmp(&sBlt, &dest->sBlt, sizeof(sBlt)-sizeof(PRECTL)-sizeof(ULONG)))
+          {
+              dprintf(("Setting up blitter: src  (%d,%d)(%d,%d)", sBlt.ulSrcPosX, sBlt.ulSrcPosY, sBlt.ulSrcWidth, sBlt.ulSrcHeight));
+              dprintf(("Setting up blitter: dest (%d,%d)(%d,%d)", sBlt.lScreenPosX, sBlt.lScreenPosY, sBlt.ulDstWidth, sBlt.ulDstHeight));
+              rc = DiveSetupBlitter(dest->hDive, &sBlt);
+              if(rc) {
+                  dprintf(("DiveSetupBlitter returned %d", rc));
+                  return(DD_OK);
+              }
+              sBlt.ulNumDstRects     = DIVE_FULLY_VISIBLE;
+              sBlt.pVisDstRects      = NULL;
+              memcpy(&dest->sBlt, &sBlt, sizeof(sBlt));
+          }
+          dprintf(("DiveBlitImage %x %d->%d", dest->hDive, src->diveBufNr, dest->diveBufNr));
+          rc = DiveBlitImage(dest->hDive, src->diveBufNr, dest->diveBufNr);
+          if(rc) {
+              dprintf(("DiveBlitImage returned %d", rc));
+              return(DD_OK);
+          }
+          return DD_OK;
+      }
+  }
+
   //TODO: do we need to check the source for clipping information in case
   //      the app wants to copy from the frame buffer?
@@ -2403 +2506 @@
                       newsrc.bottom = newsrc.top + RECT_HEIGHT(&newdest);
 
+//                      DDSURFACEDESC2 surfdesc = {0};
+//                      SurfLock4(dest, &newdest, &surfdesc, 0, 0);
+
                       ret = SurfDoBlt(This, &newdest, lpDDSrcSurface, &newsrc, dwFlags, lpDDBltFx);
                       if(ret != DD_OK) {
                           break;
                       }
+//                      SurfUnlock(dest, surfdesc.lpSurface);
                   }
               }
@@ -4487 +4594 @@
     return DDERR_INVALIDPARAMS;
 
+#ifdef DEBUG
+  _dump_pixelformat(&me->DDSurfaceDesc.ddpfPixelFormat);
+#endif
+
   memcpy( (char*)lpPixelFormat,
           (char*)&(me->DDSurfaceDesc.ddpfPixelFormat),
@@ -4703 +4814 @@
                    pIRectNew);
 
+    if(me->diveBufNr == DIVE_BUFFER_SCREEN) 
+    {
+        OS2RECTL rectOS2;
+
+        rectOS2.xLeft   = pIRectNew->Left();
+        rectOS2.yBottom = me->DDSurfaceDesc.dwHeight - pIRectNew->Bottom();
+        rectOS2.xRight  = pIRectNew->Right();
+        rectOS2.yTop    = me->DDSurfaceDesc.dwHeight - pIRectNew->Top();
+        dprintf(("DiveAcquireFrameBuffer (%d,%d)(%d,%d)", rectOS2.xLeft, rectOS2.yBottom, rectOS2.xRight, rectOS2.yTop));
+        int ret = DiveAcquireFrameBuffer(me->hDive, (PRECTL)&rectOS2);
+        if(ret) {
+            dprintf(("ERROR: DiveAcquireFrameBuffer failed with %d", ret));
+        }
+    }
     me->fLocked = TRUE;
   }
@@ -5124 +5249 @@
     else
       dprintf( ("No ColorConversion Needed"));
+
+
+    if(me->diveBufNr == DIVE_BUFFER_SCREEN) 
+    {
+        OS2RECTL rectOS2;
+
+        rectOS2.xLeft   = pIRectEnum->Left();
+        rectOS2.yBottom = me->DDSurfaceDesc.dwHeight - pIRectEnum->Bottom();
+        rectOS2.xRight  = pIRectEnum->Right();
+        rectOS2.yTop    = me->DDSurfaceDesc.dwHeight - pIRectEnum->Top();
+        dprintf(("DiveDeacquireFrameBuffer (%d,%d)(%d,%d)", rectOS2.xLeft, rectOS2.yBottom, rectOS2.xRight, rectOS2.yTop));
+        int ret = DiveDeacquireFrameBuffer(me->hDive);
+        if(ret) {
+            dprintf(("ERROR: DiveDeacquireFrameBuffer failed with %d", ret));
+        }
+    }
 
     // delete tne DDRectobject of the found rectangle