Changeset 416 for trunk/src

Timestamp:

Aug 4, 1999, 11:25:26 PM (26 years ago)

Author:

hugh

Message:

Updated colorconversion and added some more debugoutput

Location:

trunk/src/ddraw

Files:

• OS2DDRAW.CPP (modified) (8 diffs)
• OS2SURFACE.CPP (modified) (18 diffs)

trunk/src/ddraw/OS2DDRAW.CPP

@@ -355 +355 @@
   if(rc != DD_OK)
   {
-    WriteLog("Error createing Surface");
+    WriteLog("Error createing Surface\n\n");
     *lplpDD = NULL;
     delete newsurf;
@@ -362 +362 @@
     *lplpDD = (IDirectDrawSurface *)newsurf;
 
+  WriteLog("New Surface created at %08X\n\n", newsurf);
   return(rc);
 }
@@ -395 +396 @@
   if(rc != DD_OK)
   {
-    WriteLog("Error createing Surface");
+    WriteLog("Error createing Surface\n\n");
     *lplpDD = NULL;
     delete newsurf;
@@ -401 +402 @@
   else
     *lplpDD = (IDirectDrawSurface4 *)newsurf;
+
+  WriteLog("New Surface created at %08X\n\n", newsurf);
 
   return(rc);
@@ -1190 +1193 @@
               DWORD dwFlags)
 {
+ ULONG rc;
  OS2IDirectDraw        *me = (OS2IDirectDraw *)This;
 
@@ -1198 +1202 @@
   me->screenheight = dwHeight;
   me->screenbpp    = dwBPP;
+  if(me->screenbpp!=me->dCaps.ulDepth)
+  {
+    rc = DiveOpen( &me->hDiveColorConv,
+                   FALSE,
+                   0);
+    WriteLog("Screen in different mode than requested, open addional DIVE instance(rc=%X)\n\n",rc);
+
+  }
 //  _interrupt(3);
   return(DD_OK);
@@ -1206 +1218 @@
              DWORD dwBPP)
 {
+ ULONG rc;
  OS2IDirectDraw        *me = (OS2IDirectDraw *)This;
 
@@ -1214 +1227 @@
   me->screenheight = dwHeight;
   me->screenbpp    = dwBPP;
+  if(me->screenbpp!=me->dCaps.ulDepth)
+  {
+    rc = DiveOpen( &me->hDiveColorConv,
+                   FALSE,
+                   0);
+    WriteLog("Screen in different mode than requested, open addional DIVE instance(rc=%X)\n\n",rc);
+
+  }
 //  _interrupt(3);
   return(DD_OK);

trunk/src/ddraw/OS2SURFACE.CPP

@@ -296 +296 @@
 
   hDive                      = lpDirectDraw->GetDiveInstance();
+  hDiveCC                    = lpDirectDraw->GetCCDiveInstance();
   surfaceType                = DDSCAPS_OFFSCREENPLAIN;
   memcpy((char *)&DDSurfaceDesc, (char *)lpDDSurfaceDesc, sizeof(DDSURFACEDESC2));
@@ -1076 +1077 @@
   SETUP_BLITTER sBlt;
   ULONG ulDN1, ulDN2;
-
+  ULONG rc;
   ulDN1 = ulDN2 = 0;
 
@@ -1103 +1104 @@
   sBlt.ulNumDstRects     = DIVE_FULLY_VISIBLE;
 
-  DiveAllocImageBuffer( hDiveCC,
-                        &ulDN1,
-                        sBlt.fccSrcColorFormat,
-                        width,
-                        height,
-                        dwPitchFB,
-                        (PBYTE)pFrameBuffer);
-  DiveAllocImageBuffer( hDiveCC,
-                        &ulDN2,
-                        sBlt.fccDstColorFormat,
-                        width,
-                        height,
-                        dwPitchDB,
-                        (PBYTE)pDiveBuffer);
-  DiveSetupBlitter(hDiveCC,&sBlt);
-  DiveBlitImage(hDiveCC,ulDN1,ulDN2);
-  DiveFreeImageBuffer(hDiveCC,ulDN1);
-  DiveFreeImageBuffer(hDiveCC,ulDN2);
+  rc = DiveAllocImageBuffer( hDiveCC,
+                             &ulDN1,
+                             sBlt.fccSrcColorFormat,
+                             width,
+                             height,
+                             dwPitchFB,
+                             (PBYTE)pFrameBuffer);
+  WriteLog("AllocDiveSrc Buffer rc= %X\n",rc);
+
+  rc = DiveAllocImageBuffer( hDiveCC,
+                             &ulDN2,
+                             sBlt.fccDstColorFormat,
+                             width,
+                             height,
+                             dwPitchDB,
+                             (PBYTE)pDiveBuffer);
+  WriteLog("AllocDiveDst Buffer rc= %Xd\n",rc);
+
+  rc = DiveSetupBlitter( hDiveCC,
+                         &sBlt);
+  WriteLog("SetupBlitter rc= %X\n",rc);
+
+  rc = DiveBlitImage( hDiveCC,
+                      ulDN1,
+                      ulDN2);
+
+  WriteLog("Blit rc= %X\n",rc);
+
+  rc = DiveFreeImageBuffer( hDiveCC,
+                            ulDN1);
+  WriteLog("Free Src rc= %X\n",rc);
+
+  rc = DiveFreeImageBuffer( hDiveCC,
+                            ulDN2);
+
+  WriteLog("Free dst rc= %X\n",rc);
+
 }
 //******************************************************************************
@@ -1582 +1602 @@
   #ifdef DEBUG
     if ( (NULL!=lpDestRect)&& (NULL!=lpSrcRect))
-      WriteLog("SurfBlt4 to (%d,%d)(%d,%d) from (%d,%d)(%d,%d)\n", lpDestRect->left, lpDestRect->top,
-               lpDestRect->right, lpDestRect->bottom, lpSrcRect->left, lpSrcRect->top,
-               lpSrcRect->right, lpSrcRect->bottom);
+      WriteLog("SurfBlt4 to (%d,%d)(%d,%d) at %08X from (%d,%d)(%d,%d) at %08X\n", lpDestRect->left, lpDestRect->top,
+               lpDestRect->right, lpDestRect->bottom, dest, lpSrcRect->left, lpSrcRect->top,
+               lpSrcRect->right, lpSrcRect->bottom, src);
+
+    _dump_DDBLT(dwFlags);
   #endif
 
@@ -1647 +1669 @@
   if(dwFlags & DDBLT_COLORFILL)
   {
+    WriteLog("ColorFill\n");
     if((NULL==lpDDBltFx)||(lpDDBltFx->dwSize!=sizeof(DDBLTFX)) )
       return DDERR_INVALIDPARAMS;
@@ -1660 +1683 @@
   if (dwFlags & DDBLT_DEPTHFILL)
   {
+    WriteLog("DepthFill\n");
   #ifdef USE_OPENGL
     GLboolean ztest;
@@ -1788 +1812 @@
   {
     // Stretching not supported
+    WriteLog("No stretched blits\n");
+
     return DDERR_NOSTRETCHHW;
   }
@@ -1793 +1819 @@
   if (dest->DDSurfaceDesc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)
   {
+    WriteLog("Dest is Primary Surface\n");
     if(src->DDSurfaceDesc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)
     {
       // special Type 1 : Bliting between parts of the screen
+
+      WriteLog("Src is Primary Surface\n");
 
       if( *pIRectDest == *pIRectSrc)
@@ -2414 +2443 @@
   char *pBltPos, *pSrcPos;
   DWORD dwDestColor, dwSrcColor, BlitWidth, BlitHeight,x,y;
-  #ifdef DEBUG
-    WriteLog("SurfBltFast (%d, %d)\n",dwX,dwY);
+
+  #ifdef DEBUG
+    WriteLog("SurfBltFast4 %08X at(%d/%d) onto %08X with flags %08X\n",src, dwX,dwY, dest, dwTrans);
   #endif
 
@@ -2422 +2452 @@
       (dwX>dest->width) ||
       (dwY>dest->height))
+  {
+    WriteLog("Invalid Parameters %08X, %d %d", lpDDSrcSurface ,dest->width , dest->height);
     return DDERR_INVALIDPARAMS;
+  }
 
   if (NULL!=lpSrcRect)
@@ -2449 +2482 @@
   if(dwTrans & DDBLTFAST_NOCOLORKEY)
   {
+    WriteLog("Solid Blit");
     #ifdef USE_ASM
-    BltRec(pBltPos, pSrcPos, BlitWidth, BlitHeight,
-           dest->dwPitchDB,
-           src->dwPitchDB);
+      BltRec(pBltPos, pSrcPos, BlitWidth, BlitHeight,
+             dest->dwPitchDB,
+             src->dwPitchDB);
     #else
-    // Solid Blit
-    while(1)
-    {
-      memcpy(pBltPos,pSrcPos,BlitWidth);
-      pBltPos += dest->dwPitchDB;
-      pSrcPos += src->dwPitchDB;
-      if(! (--BlitHeight))
-        break;
-    }
+      // Solid Blit
+      while(1)
+      {
+        memcpy(pBltPos,pSrcPos,BlitWidth);
+        pBltPos += dest->dwPitchDB;
+        pSrcPos += src->dwPitchDB;
+        if(! (--BlitHeight))
+          break;
+      }
     #endif
 
@@ -2468 +2502 @@
   else
   {
+    WriteLog("TransBlit");
+
     if(dwTrans & DDBLTFAST_SRCCOLORKEY)
     {
@@ -3627 +3663 @@
 
   #ifdef DEBUG
-    WriteLog("SurfLock4 %d %08X %d %d\n", (int)lpRect, (int)lpSurfaceDesc, dwFlags, hEvent);
+    WriteLog("SurfLock4 %08X %08X %d %d\n", (int)lpRect, (int)lpSurfaceDesc, dwFlags, hEvent);
   #endif
 
@@ -3652 +3688 @@
     {
       // If anything is locked we can't locke the complete surface
-      WriteLog("Surface has locked Rectangles, and we want to complete lock it");
+      WriteLog("Surface has locked Rectangles, and we want to complete lock it\n");
       Found = TRUE;
     }
@@ -3660 +3696 @@
       // be locked so check for this
 
-      WriteLog("Surface has locked Rectangles, check if the overlap");
+      WriteLog("Surface has locked Rectangles, check if the overlap\n");
 
       i=0;
@@ -3683 +3719 @@
       delete pIRectNew;
       #ifdef DEBUG
-        WriteLog("SurfLock4: Surface already locked\n");
+        WriteLog("SurfLock4: Surface already locked\n\n");
       #endif
       return(DDERR_SURFACEBUSY);
@@ -3697 +3733 @@
                                 (lpRect->left * (lpSurfaceDesc->ddpfPixelFormat.dwRGBBitCount>>3)));
     #ifdef DEBUG
-      WriteLog("SurfLock4 %08X (x,y) = (%d,%d)\n", lpSurfaceDesc->lpSurface, lpRect->top, lpRect->left);
+      WriteLog("SurfLock4 %08X (x,y) = (%d,%d)\n\n", lpSurfaceDesc->lpSurface, lpRect->top, lpRect->left);
     #endif
   }
@@ -3703 +3739 @@
   {
     #ifdef DEBUG
-      WriteLog("SurfLock4 %08X \n", lpSurfaceDesc->lpSurface);
+      WriteLog("SurfLock4 %08X \n\n", lpSurfaceDesc->lpSurface);
     #endif
   }