Changeset 21483 for trunk/src/ddraw/surfblit.cpp

Timestamp:

Nov 29, 2010, 2:07:07 PM (15 years ago)

Author:

dmik

Message:

ddraw: Don't define CINTERFACE twice.

File:

• trunk/src/ddraw/surfblit.cpp (modified) (12 diffs)

trunk/src/ddraw/surfblit.cpp

@@ -25 +25 @@
 #include <fourcc.h>
 
-#define CINTERFACE
+#ifndef CINTERFACE
+#define CINTERFACE 1
+#endif
 #include "ddraw2d.h"
 #include "clipper.h"
@@ -196 +198 @@
 
   //src == NULL for colorfill
-  if(src) 
+  if(src)
   {
    if (NULL!=lpSrcRect)
@@ -259 +261 @@
     SrcRect.right  = src->width;
    }
-  
+
    if(src->fLocked)
    {
@@ -299 +301 @@
   if(dest->diveBufNr == DIVE_BUFFER_SCREEN &&
      !(dwFlags & (DDBLT_COLORFILL|DDBLT_DEPTHFILL|DDBLT_ROP) ) &&
-     dest->DDSurfaceDesc.ddpfPixelFormat.dwRGBBitCount > 8 && 
+     dest->DDSurfaceDesc.ddpfPixelFormat.dwRGBBitCount > 8 &&
      src->DDSurfaceDesc.ddpfPixelFormat.dwRGBBitCount > 8)
   {
@@ -311 +313 @@
       if( (src->DDSurfaceDesc.dwHeight == srcheight &&
            src->DDSurfaceDesc.dwWidth  == srcwidth) ||
-          (srcwidth != destwidth && srcheight != destheight) )  
+          (srcwidth != destwidth && srcheight != destheight) )
       {
           SETUP_BLITTER          sBlt = {0};
@@ -333 +335 @@
           sBlt.pVisDstRects      = NULL;
 
-          if(dest->lpClipper && dest->lpClipper->IsClipListChangedInt()) 
+          if(dest->lpClipper && dest->lpClipper->IsClipListChangedInt())
           {
               DWORD rgnsize;
-              if(ClipGetClipList((IDirectDrawClipper*)dest->lpClipper, NULL, NULL, &rgnsize) == DD_OK) 
+              if(ClipGetClipList((IDirectDrawClipper*)dest->lpClipper, NULL, NULL, &rgnsize) == DD_OK)
               {
                   LPRGNDATA lpRgnData = (LPRGNDATA)alloca(rgnsize);
@@ -343 +345 @@
                       goto dodiveblit;
                   }
-                  if(ClipGetClipList((IDirectDrawClipper*)dest->lpClipper, NULL, lpRgnData, &rgnsize) == DD_OK) 
+                  if(ClipGetClipList((IDirectDrawClipper*)dest->lpClipper, NULL, lpRgnData, &rgnsize) == DD_OK)
                   {
                       OS2RECTL *pRectl = (OS2RECTL *)&lpRgnData->Buffer;
@@ -352 +354 @@
                       }
                       dprintf(("visible region"));
-                      for(i=0;i<lpRgnData->rdh.nCount;i++) 
+                      for(i=0;i<lpRgnData->rdh.nCount;i++)
                       {
                           //win32 -> os2 coordinates (region data in screen coordinates)
@@ -413 +415 @@
   //TODO: do we need to check the source for clipping information in case
   //      the app wants to copy from the frame buffer?
-  if(dest->lpClipper) 
+  if(dest->lpClipper)
   {
       DWORD rgnsize;
-      if(ClipGetClipList((IDirectDrawClipper*)dest->lpClipper, NULL, NULL, &rgnsize) == DD_OK) 
+      if(ClipGetClipList((IDirectDrawClipper*)dest->lpClipper, NULL, NULL, &rgnsize) == DD_OK)
       {
           LPRGNDATA lpRgnData = (LPRGNDATA)alloca(rgnsize);
@@ -423 +425 @@
               goto doblit;
           }
-          if(ClipGetClipList((IDirectDrawClipper*)dest->lpClipper, NULL, lpRgnData, &rgnsize) == DD_OK) 
+          if(ClipGetClipList((IDirectDrawClipper*)dest->lpClipper, NULL, lpRgnData, &rgnsize) == DD_OK)
           {
               RECT newdest, newsrc;
@@ -431 +433 @@
               QueryPerformanceCounter(&liStart);
 #endif
-              for(i=0;i<lpRgnData->rdh.nCount;i++) 
+              for(i=0;i<lpRgnData->rdh.nCount;i++)
               {
                   dprintf(("Clip list %d (%d,%d)(%d,%d)", i, lpClipRect[i].left, lpClipRect[i].bottom, lpClipRect[i].right, lpClipRect[i].top));
 
-                  if(IntersectRect(&newdest, &DestRect, &lpClipRect[i]) == TRUE) 
+                  if(IntersectRect(&newdest, &DestRect, &lpClipRect[i]) == TRUE)
                   {
                       //TODO: This is not correct for stretching blits
@@ -446 +448 @@
 //                      DDSURFACEDESC2 surfdesc = {0};
 //                      SurfLock4(dest, &newdest, &surfdesc, 0, 0);
-   
+
                       ret = SurfDoBlt(This, &newdest, lpDDSrcSurface, (lpSrcRect) ? &newsrc : NULL, dwFlags, lpDDBltFx);
                       if(ret != DD_OK) {