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

Timestamp:

Jun 3, 2014 2:36:21 PM (11 years ago)

Author:

vboxsync

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

94133

Message:

DisplayImpl: should work without attached framebuffer.

File:

• trunk/src/VBox/Main/src-client/DisplayImpl.cpp (modified) (18 diffs)

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -676 +676 @@
         return;
 
-    ULONG ul;
-    for (ul = 0; ul < mcMonitors; ul++)
-        maFramebuffers[ul].pFramebuffer = NULL;
+    unsigned uScreenId;
+    for (uScreenId = 0; uScreenId < mcMonitors; uScreenId++)
+    {
+        maFramebuffers[uScreenId].pSourceBitmap.setNull();
+        maFramebuffers[uScreenId].pFramebuffer.setNull();
+    }
 
     if (mParent)
@@ -960 +963 @@
     }
 
-    if (maFramebuffers[uScreenId].pFramebuffer.isNull())
-    {
-        return VINF_SUCCESS;
-    }
+    /* Guest screen image will be invalid during resize, make sure that it is not updated. */
+    if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
+    {
+        mpDrv->pUpPort->pfnSetRenderVRAM(mpDrv->pUpPort, false);
+
+        mpDrv->IConnector.pu8Data    = NULL;
+        mpDrv->IConnector.cbScanline = 0;
+        mpDrv->IConnector.cBits      = 32; /* DevVGA does not work with cBits == 0. */
+        mpDrv->IConnector.cx         = 0;
+        mpDrv->IConnector.cy         = 0;
+    }
+
+    maFramebuffers[uScreenId].pSourceBitmap.setNull();
 
     ULONG pixelFormat;
@@ -1009 +1021 @@
     }
 
-    /* Framebuffer will be invalid during resize, make sure that it is not accessed. */
-    if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
-    {
-        mpDrv->pUpPort->pfnSetRenderVRAM(mpDrv->pUpPort, false);
-
-        mpDrv->IConnector.pu8Data    = NULL;
-        mpDrv->IConnector.cbScanline = 0;
-        mpDrv->IConnector.cBits      = 32; /* DevVGA does not work with cBits == 0. */
-        mpDrv->IConnector.cx         = 0;
-        mpDrv->IConnector.cy         = 0;
-    }
-
-    maFramebuffers[uScreenId].pSourceBitmap.setNull();
-
-    int rc = callFramebufferResize (maFramebuffers[uScreenId].pFramebuffer, uScreenId,
-                                    pixelFormat, pvVRAM, bpp, cbLine, w, h);
-    if (rc == VINF_VGA_RESIZE_IN_PROGRESS)
-    {
-        /* Immediately return to the caller. ResizeCompleted will be called back by the
-         * GUI thread. The ResizeCompleted callback will change the resize status from
-         * InProgress to UpdateDisplayData. The latter status will be checked by the
-         * display timer callback on EMT and all required adjustments will be done there.
-         */
-        return rc;
+    if (!maFramebuffers[uScreenId].pFramebuffer.isNull())
+    {
+        int rc = callFramebufferResize (maFramebuffers[uScreenId].pFramebuffer, uScreenId,
+                                        pixelFormat, pvVRAM, bpp, cbLine, w, h);
+        if (rc == VINF_VGA_RESIZE_IN_PROGRESS)
+        {
+            /* Immediately return to the caller. ResizeCompleted will be called back by the
+             * GUI thread. The ResizeCompleted callback will change the resize status from
+             * InProgress to UpdateDisplayData. The latter status will be checked by the
+             * display timer callback on EMT and all required adjustments will be done there.
+             */
+            return rc;
+        }
     }
 
@@ -1265 +1266 @@
 #endif /* DEBUG_sunlover */
 
-    IFramebuffer *pFramebuffer = maFramebuffers[uScreenId].pFramebuffer;
-
-    // if there is no framebuffer, this call is not interesting
-    if (   pFramebuffer == NULL
-        || maFramebuffers[uScreenId].fDisabled)
+    /* No updates for a disabled guest screen. */
+    if (maFramebuffers[uScreenId].fDisabled)
         return;
-
-    pFramebuffer->Lock();
 
     if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
@@ -1280 +1276 @@
                                           maFramebuffers[uScreenId].h);
 
-    if (w != 0 && h != 0)
-        pFramebuffer->NotifyUpdate(x, y, w, h);
-
-    pFramebuffer->Unlock();
+    IFramebuffer *pFramebuffer = maFramebuffers[uScreenId].pFramebuffer;
+    if (pFramebuffer != NULL)
+    {
+        pFramebuffer->Lock();
+
+        if (w != 0 && h != 0)
+            pFramebuffer->NotifyUpdate(x, y, w, h);
+
+        pFramebuffer->Unlock();
+    }
 
 #ifndef VBOX_WITH_HGSMI
@@ -1622 +1624 @@
     uint32_t h = pFBInfo->dirtyRect.yBottom - pFBInfo->dirtyRect.yTop;
 
-    if (!pFBInfo->fDefaultFormat && pFBInfo->pFramebuffer && w != 0 && h != 0)
+    if (!pFBInfo->fDefaultFormat && w != 0 && h != 0)
     {
         //@todo pfnUpdateDisplayRect must take the vram offset parameter for the framebuffer
@@ -3359 +3361 @@
         if (RT_SUCCESS(rc))
         {
-            if (!pFBInfo->pFramebuffer.isNull())
+            if (!pFBInfo->pSourceBitmap.isNull())
             {
-                /* Update the changed screen area. When framebuffer uses VRAM directly, just notify
-                 * it to update. And for default format, render the guest VRAM to framebuffer.
+                /* Update the changed screen area. When source bitmap uses VRAM directly, just notify
+                 * frontend to update. And for default format, render the guest VRAM to the source bitmap.
                  */
                 if (   pFBInfo->fDefaultFormat
@@ -3411 +3413 @@
                     }
                 }
-
-                pDisplay->handleDisplayUpdate(aScreenId, x, y, width, height);
             }
+
+            pDisplay->handleDisplayUpdate(aScreenId, x, y, width, height);
         }
     }
@@ -3499 +3501 @@
 
         if (   !pFBInfo->fVBVAEnabled
-            && uScreenId == VBOX_VIDEO_PRIMARY_SCREEN
-            && !pFBInfo->pFramebuffer.isNull())
+            && uScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
         {
             pDisplay->mpDrv->pUpPort->pfnUpdateDisplayAll(pDisplay->mpDrv->pUpPort);
@@ -3506 +3507 @@
         else
         {
-            if (   !pFBInfo->pFramebuffer.isNull()
-                && !pFBInfo->fDisabled
+            if (   !pFBInfo->fDisabled
                 && pFBInfo->u32ResizeStatus == ResizeStatus_Void)
             {
@@ -4130 +4130 @@
                 /* No VBVA do a display update. */
                 DISPLAYFBINFO *pFBInfo = &pDisplay->maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN];
-                if (!pFBInfo->pFramebuffer.isNull() && pFBInfo->u32ResizeStatus == ResizeStatus_Void)
+                if (pFBInfo->u32ResizeStatus == ResizeStatus_Void)
                 {
                     pDisplay->vbvaLock();
@@ -4148 +4148 @@
                 DISPLAYFBINFO *pFBInfo = &pDisplay->maFramebuffers[uScreenId];
 
-                if (!pFBInfo->pFramebuffer.isNull() && pFBInfo->u32ResizeStatus == ResizeStatus_Void)
+                if (pFBInfo->u32ResizeStatus == ResizeStatus_Void)
                 {
                     Assert (pDisplay->mParent && pDisplay->mParent->consoleVRDPServer());
@@ -4208 +4208 @@
                     && pFBInfo->u32ResizeStatus == ResizeStatus_Void)
                 {
-                    int rc;
+                    int rc = VERR_NOT_SUPPORTED;
                     if (   pFBInfo->fVBVAEnabled
                         && pFBInfo->pu8FramebufferVRAM)
@@ -4218 +4218 @@
                                                   pFBInfo->pu8FramebufferVRAM, u64Now);
                     }
-                    else
+                    else if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN && pDrv->IConnector.pu8Data)
                     {
                         rc = VideoRecCopyToIntBuf(pDisplay->mpVideoRecCtx, uScreenId, 0, 0,
@@ -4534 +4534 @@
 
     if (pFramebuffer == NULL)
-        return VERR_INVALID_STATE; /* notify we can not handle request atm */
+        return VERR_NOT_IMPLEMENTED; /* Implementation is not available. */
 
     HRESULT hr = pFramebuffer->ProcessVHWACommand((BYTE*)pCommand);
@@ -4975 +4975 @@
             /* Make sure that framebuffer contains the same image as the guest VRAM. */
             if (   uScreenId == VBOX_VIDEO_PRIMARY_SCREEN
-                && !pFBInfo->pFramebuffer.isNull()
                 && !pFBInfo->fDisabled)
             {
                 pDrv->pUpPort->pfnUpdateDisplayRect (pDrv->pUpPort, pCmd->x, pCmd->y, pCmd->w, pCmd->h);
             }
-            else if (   !pFBInfo->pFramebuffer.isNull()
+            else if (   !pFBInfo->pSourceBitmap.isNull()
                      && !pFBInfo->fDisabled)
             {
@@ -5302 +5301 @@
     }
 
-    if (pFBInfo->pFramebuffer.isNull())
-    {
-        /* If no framebuffer, the resize will be done later when a new framebuffer will be set in changeFramebuffer. */
-        return VINF_SUCCESS;
-    }
-
-    /* If the framebuffer already set for the screen, do a regular resize. */
+    /* Do a regular resize. */
     return pThis->handleDisplayResize(pScreen->u32ViewIndex, pScreen->u16BitsPerPixel,
                                       (uint8_t *)pvVRAM + pScreen->u32StartOffset,
@@ -5368 +5361 @@
     PDRVMAINDISPLAY pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINDISPLAY);
     LogRelFlowFunc(("iInstance=%d\n", pDrvIns->iInstance));
+
+    pThis->pUpPort->pfnSetRenderVRAM(pThis->pUpPort, false);
+
+    pThis->IConnector.pu8Data    = NULL;
+    pThis->IConnector.cbScanline = 0;
+    pThis->IConnector.cBits      = 32;
+    pThis->IConnector.cx         = 0;
+    pThis->IConnector.cy         = 0;
 
     if (pThis->pDisplay)