Changeset 16185 in vbox for trunk

Timestamp:

Jan 22, 2009 5:34:15 PM (16 years ago)

Author:

vboxsync

Message:

handleDisplayResize postpones the resize if framebuffer is being resized (fixed xTracker #3489).

Location:

trunk/src/VBox/Main

Files:

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

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -158 +158 @@
 
         memset (&maFramebuffers[ul].dirtyRect, 0 , sizeof (maFramebuffers[ul].dirtyRect));
+        memset (&maFramebuffers[ul].pendingResize, 0 , sizeof (maFramebuffers[ul].pendingResize));
     }
 
@@ -295 +296 @@
     bool f = ASMAtomicCmpXchgU32 (&maFramebuffers[uScreenId].u32ResizeStatus,
                                   ResizeStatus_InProgress, ResizeStatus_Void);
-    AssertReleaseMsg(f, ("s = %d, id = %d, f = %d\n", maFramebuffers[uScreenId].u32ResizeStatus, uScreenId, f));NOREF(f);
+    if (!f)
+    {
+        /* This could be a result of the screenshot taking call Display::TakeScreenShot:
+         * if the framebuffer is processing the resize request and GUI calls the TakeScreenShot
+         * and the guest has reprogrammed the virtual VGA devices again so a new resize is required.
+         *
+         * Save the resize information and return.
+         *
+         * Note: the resize information is only accessed on EMT so no serialization is required.
+         */
+        LogRel (("Display::handleDisplayResize(): Warning: resize postponed.\n"));
+
+        maFramebuffers[uScreenId].pendingResize.fPending    = true;
+        maFramebuffers[uScreenId].pendingResize.pixelFormat = pixelFormat;
+        maFramebuffers[uScreenId].pendingResize.pvVRAM      = pvVRAM;
+        maFramebuffers[uScreenId].pendingResize.bpp         = bpp;
+        maFramebuffers[uScreenId].pendingResize.cbLine      = cbLine;
+        maFramebuffers[uScreenId].pendingResize.w           = w;
+        maFramebuffers[uScreenId].pendingResize.h           = h;
+        
+        return VINF_SUCCESS;
+    }
 
     /* The framebuffer is locked in the state.
@@ -319 +341 @@
     AssertRelease(f);NOREF(f);
 
+    AssertRelease(!maFramebuffers[uScreenId].pendingResize.fPending);
+
     /* The method also unlocks the framebuffer. */
     handleResizeCompletedEMT();
@@ -346 +370 @@
         {
             /* This is not the display that has completed resizing. */
+            continue;
+        }
+
+        /* Check whether a resize is pending for this framebuffer. */
+        if (pFBInfo->pendingResize.fPending)
+        {
+            /* Reset the condition, call the display resize with saved data and continue. 
+             *
+             * Note: handleDisplayResize can call handleResizeCompletedEMT back,
+             *       but infinite recursion is not possible, because when the handleResizeCompletedEMT
+             *       is called, the pFBInfo->pendingResize.fPending is equal to false.
+             */
+            pFBInfo->pendingResize.fPending = false;
+            handleDisplayResize (uScreenId, pFBInfo->pendingResize.bpp, pFBInfo->pendingResize.pvVRAM,
+                                 pFBInfo->pendingResize.cbLine, pFBInfo->pendingResize.w, pFBInfo->pendingResize.h);
             continue;
         }

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

@@ -70 +70 @@
     } dirtyRect;
 
+    struct {
+        bool fPending;
+        ULONG pixelFormat;
+        void *pvVRAM;
+        uint32_t bpp;
+        uint32_t cbLine;
+        int w;
+        int h;
+    } pendingResize;
+
 } DISPLAYFBINFO;