Changeset 51836 in vbox for trunk/src

Timestamp:

Jul 3, 2014 9:40:21 AM (11 years ago)

Author:

vboxsync

Message:

DevVGA, Main: fFailOnResize parameter for pfnUpdateDisplayAll

Location:

trunk/src/VBox

Files:

• Devices/Graphics/DevVGA.cpp (modified) (5 diffs)
• Devices/Graphics/DevVGA.h (modified) (1 diff)
• Devices/Graphics/DevVGA_VDMA.cpp (modified) (2 diffs)
• Main/src-client/DisplayImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -4622 +4622 @@
  * Internal vgaPortUpdateDisplayAll worker called under pThis->CritSect.
  */
-static int updateDisplayAll(PVGASTATE pThis)
+static int updateDisplayAll(PVGASTATE pThis, bool fFailOnResize)
 {
     PPDMDEVINS pDevIns = pThis->CTX_SUFF(pDevIns);
@@ -4645 +4645 @@
     pThis->graphic_mode = -1; /* force full update */
 
-    return vga_update_display(pThis, true, true, true,
+    return vga_update_display(pThis, true, fFailOnResize, true,
             pThis->pDrv, &pThis->graphic_mode);
 }
 
 
-int vgaUpdateDisplayAll(PVGASTATE pThis)
+int vgaUpdateDisplayAll(PVGASTATE pThis, bool fFailOnResize)
 {
 #ifdef DEBUG_sunlover
@@ -4659 +4659 @@
     AssertRC(rc);
 
-    rc = updateDisplayAll(pThis);
+    rc = updateDisplayAll(pThis, fFailOnResize);
 
     PDMCritSectLeave(&pThis->CritSect);
@@ -4671 +4671 @@
  * @see     PDMIKEYBOARDPORT::pfnUpdateDisplayAll() for details.
  */
-static DECLCALLBACK(int) vgaPortUpdateDisplayAll(PPDMIDISPLAYPORT pInterface)
+static DECLCALLBACK(int) vgaPortUpdateDisplayAll(PPDMIDISPLAYPORT pInterface, bool fFailOnResize)
 {
     PVGASTATE pThis = IDISPLAYPORT_2_VGASTATE(pInterface);
@@ -4678 +4678 @@
     /* This is called both in VBVA mode and normal modes. */
 
-    return vgaUpdateDisplayAll(pThis);
+    return vgaUpdateDisplayAll(pThis, fFailOnResize);
 }
 

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -651 +651 @@
 int vboxVBVALoadStateDone (PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
 
-int vgaUpdateDisplayAll(PVGASTATE pThis);
+int vgaUpdateDisplayAll(PVGASTATE pThis, bool fFailOnResize);
 
 # ifdef VBOX_WITH_VDMA

trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp

@@ -1143 +1143 @@
     }
 
-    vgaUpdateDisplayAll(pVdma->pVGAState);
+    vgaUpdateDisplayAll(pVdma->pVGAState, /* fFailOnResize = */ false);
 
     return VINF_SUCCESS;
@@ -1606 +1606 @@
 
             /* do vgaUpdateDisplayAll right away */
-            vgaUpdateDisplayAll(pVdma->pVGAState);
+            vgaUpdateDisplayAll(pVdma->pVGAState, /* fFailOnResize = */ false);
 
             return VBoxVDMAThreadTerm(&pVdma->Thread, NULL, NULL, false);

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

@@ -1580 +1580 @@
         /* Process any pending VGA device changes, resize. */
         Assert(!vbvaLockIsOwner());
-        mpDrv->pUpPort->pfnUpdateDisplay(mpDrv->pUpPort);
+        mpDrv->pUpPort->pfnUpdateDisplayAll(mpDrv->pUpPort, /* fFailOnResize = */ false);
     }
 
@@ -1590 +1590 @@
     {
         Assert(!vbvaLockIsOwner());
-        mpDrv->pUpPort->pfnUpdateDisplay(mpDrv->pUpPort);
+        mpDrv->pUpPort->pfnUpdateDisplayAll(mpDrv->pUpPort, /* fFailOnResize = */ false);
     }
 
@@ -2047 +2047 @@
         /* VideoAccel was disabled because of a failure, switching back to VGA updates. Redraw the screen. */
         Assert(!vbvaLockIsOwner());
-        mpDrv->pUpPort->pfnUpdateDisplay(mpDrv->pUpPort);
+        mpDrv->pUpPort->pfnUpdateDisplayAll(mpDrv->pUpPort, /* fFailOnResize = */ false);
     }
 }
@@ -3294 +3294 @@
         {
             Assert(!pDisplay->vbvaLockIsOwner());
-            pDisplay->mpDrv->pUpPort->pfnUpdateDisplayAll(pDisplay->mpDrv->pUpPort);
+            pDisplay->mpDrv->pUpPort->pfnUpdateDisplayAll(pDisplay->mpDrv->pUpPort, /* fFailOnResize = */ true);
         }
         else
@@ -4573 +4573 @@
         /* Force full screen update, because VGA device must take control, do resize, etc. */
         Assert(!pThis->vbvaLockIsOwner());
-        pThis->mpDrv->pUpPort->pfnUpdateDisplay(pThis->mpDrv->pUpPort);
+        pThis->mpDrv->pUpPort->pfnUpdateDisplayAll(pThis->mpDrv->pUpPort, /* fFailOnResize = */ false);
     }
 }