Changeset 24044 in vbox

Timestamp:

Oct 23, 2009 3:51:41 PM (15 years ago)

Author:

vboxsync

Message:

2d accel: fix unnecessary unlock g->h commands

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/Display/dd.c (modified) (2 diffs)
• Devices/Graphics/HGSMI/HGSMIHost.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxFBOverlay.cpp (modified) (1 diff)
• HostDrivers/VBoxNetFlt/win/VBoxNetFltPt-win.c (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/dd.c

@@ -1187 +1187 @@
 
         if(lpSurfaceLocal->ddsCaps.dwCaps & DDSCAPS_VISIBLE
-                || (
-                        lpSurfaceLocal->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE
-                        || (
-                                !!(lpSurfaceLocal->ddsCaps.dwCaps & DDSCAPS_OVERLAY)
-                                && pDesc->bVisible
-                           )
+                || lpSurfaceLocal->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE
+                || (    !!(lpSurfaceLocal->ddsCaps.dwCaps & DDSCAPS_OVERLAY)
+                     && pDesc->bVisible
                    )
           )
@@ -1584 +1581 @@
         pBody->TargGuestSurfInfo = (uint64_t)pTargDesc;
         pBody->CurrGuestSurfInfo = (uint64_t)pCurrDesc;
+
+        pTargDesc->bVisible = pCurrDesc->bVisible;
+        pCurrDesc->bVisible = false;
 
 //        pBody->u.in.flags = vboxVHWAFromDDFLIPs(lpFlip->dwFlags);

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp

@@ -1056 +1056 @@
             if (pIns->hostHeap.cRefs)
             {
+                Assert(0);
                 /* It is possible to change the heap only if there is no pending allocations. */
                 rc = VERR_ACCESS_DENIED;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -3124 +3124 @@
 {
     VBoxVHWASurfaceBase *pSurf = handle2Surface(pCmd->u.in.hSurf);
+#ifdef DEBUG_misha
+    /* for performance reasons we should receive unlock for visible surfaces only
+     * other surfaces receive unlock only once becoming visible, e.g. on DdFlip
+     * Ensure this is so*/
+    if(pSurf != mDisplay.getPrimary())
+    {
+        const OverlayList & overlays = mDisplay.overlays();
+        bool bFound = false;
+
+        for (OverlayList::const_iterator it = overlays.begin();
+             it != overlays.end(); ++ it)
+        {
+            VBoxVHWASurfList * pSurfList = *it;
+            if(pSurfList->current() == pSurf)
+            {
+                bFound = true;
+                break;
+            }
+        }
+
+        Assert(bFound);
+    }
+#endif
     VBOXQGLLOG_ENTER(("pSurf (0x%x)\n",pSurf));
     if(pCmd->u.in.xUpdatedMemValid)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFltPt-win.c

@@ -1620 +1620 @@
             if (pPacket != NULL)
             {
+#ifndef VBOX_LOOPBACK_USEFLAGS
+                PNDIS_PACKET pLb = NULL;
+#endif
                 do
                 {
@@ -1633 +1636 @@
 
                     VBOXNETFLT_LBVERIFY(pNetFlt, pPacket);
-#else
-                    PNDIS_PACKET pLb = NULL;
 #endif
                     if(bNetFltActive)
@@ -1669 +1670 @@
 
 #ifndef VBOX_LOOPBACK_USEFLAGS
-                    Assert(pLb && !vboxNetFltWinLbIsFromIntNet(pLb));
+                    Assert(!pLb || !vboxNetFltWinLbIsFromIntNet(pLb));
 #endif
                     Status = vboxNetFltWinRecvPassThru(pAdapt, pPacket);