Changeset 23185 in vbox for trunk/src/VBox/Main/DisplayImpl.cpp

Timestamp:

Sep 21, 2009 12:23:57 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

52609

Message:

Skip VBVA update if framebufer is being resized.

File:

• trunk/src/VBox/Main/DisplayImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -208 +208 @@
 #ifdef VBOX_WITH_HGSMI
         maFramebuffers[ul].fVBVAEnabled = false;
+        maFramebuffers[ul].cVBVASkipUpdate = 0;
+        memset (&maFramebuffers[ul].vbvaSkippedRect, 0, sizeof (maFramebuffers[ul].vbvaSkippedRect));
 #endif /* VBOX_WITH_HGSMI */
     }
@@ -2403 +2405 @@
     PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
     Display *pThis = pDrv->pDisplay;
-
-    NOREF(uScreenId);
+    DISPLAYFBINFO *pFBInfo = &pThis->maFramebuffers[uScreenId];
+
+    if (RT_LIKELY(pFBInfo->u32ResizeStatus == ResizeStatus_Void))
+    {
+        if (RT_UNLIKELY(pFBInfo->cVBVASkipUpdate != 0))
+        {
+            /* Some updates were skipped. Note: displayVBVAUpdate* callbacks are called
+             * under display device lock, so thread safe.
+             */
+            pFBInfo->cVBVASkipUpdate = 0;
+            pThis->handleDisplayUpdate(pFBInfo->vbvaSkippedRect.xLeft,
+                                       pFBInfo->vbvaSkippedRect.yTop,
+                                       pFBInfo->vbvaSkippedRect.xRight - pFBInfo->vbvaSkippedRect.xLeft,
+                                       pFBInfo->vbvaSkippedRect.yBottom - pFBInfo->vbvaSkippedRect.yTop);
+        }
+    }
+    else
+    {
+        /* The framebuffer is being resized. */
+        pFBInfo->cVBVASkipUpdate++;
+    }
 }
 
@@ -2413 +2434 @@
     PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
     Display *pThis = pDrv->pDisplay;
-
-    pThis->mParent->consoleVRDPServer()->SendUpdate (uScreenId, pCmd, cbCmd);
-}
-
-DECLCALLBACK(void) Display::displayVBVAUpdateEnd(PPDMIDISPLAYCONNECTOR pInterface, unsigned uScreenId, uint32_t x, uint32_t y, uint32_t cx, uint32_t cy)
+    DISPLAYFBINFO *pFBInfo = &pThis->maFramebuffers[uScreenId];
+
+    if (RT_LIKELY(pFBInfo->cVBVASkipUpdate == 0))
+    {
+         pThis->mParent->consoleVRDPServer()->SendUpdate (uScreenId, pCmd, cbCmd);
+    }
+}
+
+DECLCALLBACK(void) Display::displayVBVAUpdateEnd(PPDMIDISPLAYCONNECTOR pInterface, unsigned uScreenId, int32_t x, int32_t y, uint32_t cx, uint32_t cy)
 {
     LogFlowFunc(("uScreenId %d %d,%d %dx%d\n", uScreenId, x, y, cx, cy));
@@ -2423 +2448 @@
     PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
     Display *pThis = pDrv->pDisplay;
+    DISPLAYFBINFO *pFBInfo = &pThis->maFramebuffers[uScreenId];
 
     /* @todo handleFramebufferUpdate (uScreenId,
@@ -2429 +2455 @@
      *                                cx, cy);
      */
-    pThis->handleDisplayUpdate(x, y, cx, cy);
+    if (RT_LIKELY(pFBInfo->cVBVASkipUpdate == 0))
+    {
+        pThis->handleDisplayUpdate(x, y, cx, cy);
+    }
+    else
+    {
+        /* Save the updated rectangle. */
+        int32_t xRight = x + cx;
+        int32_t yBottom = y + cy;
+
+        if (pFBInfo->cVBVASkipUpdate == 1)
+        {
+            pFBInfo->vbvaSkippedRect.xLeft = x;
+            pFBInfo->vbvaSkippedRect.yTop = y;
+            pFBInfo->vbvaSkippedRect.xRight = xRight;
+            pFBInfo->vbvaSkippedRect.yBottom = yBottom;
+        }
+        else
+        {
+            if (pFBInfo->vbvaSkippedRect.xLeft > x)
+            {
+                pFBInfo->vbvaSkippedRect.xLeft = x;
+            }
+            if (pFBInfo->vbvaSkippedRect.yTop > y)
+            {
+                pFBInfo->vbvaSkippedRect.yTop = y;
+            }
+            if (pFBInfo->vbvaSkippedRect.xRight < xRight)
+            {
+                pFBInfo->vbvaSkippedRect.xRight = xRight;
+            }
+            if (pFBInfo->vbvaSkippedRect.yBottom < yBottom)
+            {
+                pFBInfo->vbvaSkippedRect.yBottom = yBottom;
+            }
+        }
+    }
 }