Changeset 27751 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 26, 2010 3:28:43 PM (15 years ago)

Author:

vboxsync

Message:

Main/Display: VBVA should call Framebuffer::RequestResize only if framebuffer parameters change (xTracker 4655).

Location:

trunk/src/VBox/Main

Files:

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

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -630 +630 @@
         maFramebuffers[ul].w = 0;
         maFramebuffers[ul].h = 0;
+
+        maFramebuffers[ul].u16BitsPerPixel = 0;
+        maFramebuffers[ul].pu8FramebufferVRAM = NULL;
+        maFramebuffers[ul].u32LineSize = 0;
 
         maFramebuffers[ul].pHostEvents = NULL;
@@ -3374 +3378 @@
     DISPLAYFBINFO *pFBInfo = &pThis->maFramebuffers[pScreen->u32ViewIndex];
 
+    /* Check if this is a real resize or a notification about the screen origin.
+     * The guest uses this VBVAResize call for both.
+     */
+    bool fResize =    pFBInfo->u16BitsPerPixel != pScreen->u16BitsPerPixel
+                   || pFBInfo->pu8FramebufferVRAM != (uint8_t *)pvVRAM + pScreen->u32StartOffset
+                   || pFBInfo->u32LineSize != pScreen->u32LineSize
+                   || pFBInfo->w != pScreen->u32Width
+                   || pFBInfo->h != pScreen->u32Height;
+
+    bool fNewOrigin =    pFBInfo->xOrigin != pScreen->i32OriginX
+                      || pFBInfo->yOrigin != pScreen->i32OriginY;
+
     pFBInfo->u32Offset = pView->u32ViewOffset; /* Not used in HGSMI. */
     pFBInfo->u32MaxFramebufferSize = pView->u32MaxScreenSize; /* Not used in HGSMI. */
@@ -3383 +3399 @@
     pFBInfo->w = pScreen->u32Width;
     pFBInfo->h = pScreen->u32Height;
+
+    pFBInfo->u16BitsPerPixel = pScreen->u16BitsPerPixel;
+    pFBInfo->pu8FramebufferVRAM = (uint8_t *)pvVRAM + pScreen->u32StartOffset;
+    pFBInfo->u32LineSize = pScreen->u32LineSize;
+
+    if (fNewOrigin)
+    {
+        /* @todo May be framebuffer/display should be notified in this case. */
+    }
+
+    if (!fResize)
+    {
+        /* No paramaters of the framebuffer have actually changed. */
+        return VINF_SUCCESS;
+    }
 
     return pThis->handleDisplayResize(pScreen->u32ViewIndex, pScreen->u16BitsPerPixel,

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

@@ -53 +53 @@
     ULONG h;
 
+    uint16_t u16BitsPerPixel;
+    uint8_t *pu8FramebufferVRAM;
+    uint32_t u32LineSize;
+
     VBOXVIDEOINFOHOSTEVENTS *pHostEvents;