Changeset 2219 in vbox for trunk

Timestamp:

Apr 19, 2007 12:19:29 PM (18 years ago)

Author:

vboxsync

Message:

Repaint display when framebuffer completed an asynchronous resize.

Location:

trunk/src/VBox/Main

Files:

• DisplayImpl.cpp (modified) (5 diffs)
• include/DisplayImpl.h (modified) (1 diff)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -273 +273 @@
 
     /* The method also unlocks the framebuffer. */
-    handleResizeCompletedEMT(false /* fAsync */);
+    handleResizeCompletedEMT();
 
     return VINF_SUCCESS;
@@ -284 +284 @@
  *  @thread EMT
  */
-void Display::handleResizeCompletedEMT (bool fAsync)
+void Display::handleResizeCompletedEMT (void)
 {
     LogFlowFunc(("\n"));
@@ -298 +298 @@
 
         mpDrv->pUpPort->pfnSetRenderVRAM (mpDrv->pUpPort, newPixelFormat == FramebufferPixelFormat_PixelFormatDefault);
-
-        /* Unlock framebuffer. */
-        mFramebuffer->Unlock();
     }
 
@@ -322 +319 @@
     bool f = ASMAtomicCmpXchgU32 (&mu32ResizeStatus, ResizeStatus_Void, ResizeStatus_UpdateDisplayData);
     AssertRelease(f);NOREF(f);
-
-    if (fAsync)
-    {
-        /* Repaint the display, but only if the resize was asynchronous. That is only
-         * when VINF_VGA_RESIZE_IN_PROGRESS was returned to the VGA device and VM continued
-         * to run during the framebuffer resize. */
-        mpDrv->pUpPort->pfnUpdateDisplayAll(mpDrv->pUpPort);
+    
+    if (!mFramebuffer.isNull())
+    {
+        /* Unlock framebuffer after evrything is done. */
+        mFramebuffer->Unlock();
     }
 }
@@ -1800 +1795 @@
         LogFlowFunc (("ResizeStatus_UpdateDisplayData\n"));
         /* The framebuffer was resized and display data need to be updated. */
-        pDisplay->handleResizeCompletedEMT (true /* fAsync */);
+        pDisplay->handleResizeCompletedEMT ();
         /* Continue with normal processing because the status here is ResizeStatus_Void. */
         Assert (pDisplay->mu32ResizeStatus == ResizeStatus_Void);
+        /* Repaint the display because VM continued to run during the framebuffer resize. */
+        if (!pDisplay->mFramebuffer.isNull())
+            pDrv->pUpPort->pfnUpdateDisplayAll(pDrv->pUpPort);
+        /* Ignore the refresh to replay the logic. */
+        return;
     }
     else if (u32ResizeStatus == ResizeStatus_InProgress)

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -185 +185 @@
     void vbvaReleaseCmd (VBVACMDHDR *pHdr, int32_t cbCmd);
 
-    void handleResizeCompletedEMT (bool fAsync);
+    void handleResizeCompletedEMT (void);
     volatile uint32_t mu32ResizeStatus;