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

Timestamp:

Oct 10, 2001, 4:40:45 PM (24 years ago)

Author:

sandervl

Message:

commented out Dive(De)AcquireFrameBuffer in SurfLock/Unlock

File:

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

trunk/src/ddraw/OS2SURFACE.CPP

@@ -1 @@
-/* $Id: OS2SURFACE.CPP,v 1.36 2001-10-07 08:25:30 sandervl Exp $ */
+/* $Id: OS2SURFACE.CPP,v 1.37 2001-10-10 14:40:45 sandervl Exp $ */
 
 /*
@@ -306 +306 @@
 #define CBM_CREATEDIB   0x02L   /* create DIB bitmap */
 
+//#define PERFTEST
+#ifdef PERFTEST
+LARGE_INTEGER liStart;
+LARGE_INTEGER liEnd;
+ULONG average = 0;
+#endif
+
 #ifdef DEBUG
+
 // ******************************************************************************
 // *    internal helper functions from WINE
@@ -1732 +1740 @@
 {
 
+#ifdef PERFTEST
+  WriteLog("Average blitting time: %x clock ticks");
+#endif
+
   if(DDSurfaceDesc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)
   {
@@ -2458 +2470 @@
           }
 dodiveblit:
+#ifdef PERFTEST
+          QueryPerformanceCounter(&liStart);
+#endif
           if(fChanged || memcmp(&sBlt, &dest->sBlt, sizeof(sBlt)-sizeof(PRECTL)-sizeof(ULONG)))
           {
@@ -2477 +2492 @@
               return(DD_OK);
           }
+#ifdef PERFTEST
+          QueryPerformanceCounter(&liEnd);
+          if(liEnd.HighPart == liStart.HighPart) {
+              if(average == 0) {
+                    average = (liEnd.LowPart - liStart.LowPart);
+              }
+              else  average = (average + (liEnd.LowPart - liStart.LowPart))/2;
+          }
+#endif
           return DD_OK;
       }
@@ -2498 +2522 @@
               LPRECT lpClipRect = (LPRECT)&lpRgnData->Buffer;
 
+#ifdef PERFTEST
+              QueryPerformanceCounter(&liStart);
+#endif
               for(i=0;i<lpRgnData->rdh.nCount;i++) 
               {
@@ -2518 +2545 @@
                   }
               }
+#ifdef PERFTEST
+              if(liEnd.HighPart == liStart.HighPart) {
+                  QueryPerformanceCounter(&liEnd);
+                  if(average == 0) {
+                        average = (liEnd.LowPart - liStart.LowPart);
+                  }
+                  else  average = (average + (liEnd.LowPart - liStart.LowPart))/2;
+              }
+#endif
+
               return ret;
           }
@@ -4816 +4853 @@
                    pIRectNew);
 
+#if 0
     if(me->diveBufNr == DIVE_BUFFER_SCREEN) 
     {
@@ -4830 +4868 @@
         }
     }
+#endif
     me->fLocked = TRUE;
   }
@@ -5253 +5292 @@
 
 
+#if 0
     if(me->diveBufNr == DIVE_BUFFER_SCREEN) 
     {
@@ -5267 +5307 @@
         }
     }
+#endif
 
     // delete tne DDRectobject of the found rectangle