Changeset 76789 in vbox

Timestamp:

Jan 12, 2019 10:53:42 AM (6 years ago)

Author:

vboxsync

Message:

DevVGA-SVGA.cpp: support for blanking

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp (modified) (3 diffs)

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

@@ -3802 +3802 @@
                          pCmd->screen.backingStore.ptr.gmrId, pCmd->screen.backingStore.ptr.offset, pCmd->screen.backingStore.pitch));
 
-                AssertBreak(pCmd->screen.id < RT_ELEMENTS(pThis->svga.pSvgaR3State->aScreens));
+                uint32_t const idScreen = pCmd->screen.id;
+                AssertBreak(idScreen < RT_ELEMENTS(pThis->svga.pSvgaR3State->aScreens));
 
                 uint32_t const uWidth = pCmd->screen.size.width;
-                AssertBreak(0 < uWidth && uWidth <= pThis->svga.u32MaxWidth);
+                AssertBreak(uWidth <= pThis->svga.u32MaxWidth);
 
                 uint32_t const uHeight = pCmd->screen.size.height;
-                AssertBreak(0 < uHeight && uHeight <= pThis->svga.u32MaxHeight);
+                AssertBreak(uHeight <= pThis->svga.u32MaxHeight);
 
                 uint32_t const cbWidth = uWidth * ((32 + 7) / 8); /** @todo 32? */
                 uint32_t const cbPitch = pCmd->screen.backingStore.pitch ? pCmd->screen.backingStore.pitch : cbWidth;
-                AssertBreak(0 < cbWidth && cbWidth <= cbPitch);
+                AssertBreak(cbWidth <= cbPitch);
 
                 uint32_t const uScreenOffset = pCmd->screen.backingStore.ptr.offset;
@@ -3818 +3819 @@
 
                 uint32_t const cbVram = pThis->vram_size - uScreenOffset;
-                AssertBreak(uHeight <= cbVram / cbPitch);
+                /* If we have a not zero pitch, then height can't exceed the available VRAM. */
+                AssertBreak(   (uHeight == 0 && cbPitch == 0)
+                            || (cbPitch > 0 && uHeight <= cbVram / cbPitch));
                 RT_UNTRUSTED_VALIDATED_FENCE();
 
-                VMSVGASCREENOBJECT *pScreen = &pThis->svga.pSvgaR3State->aScreens[pCmd->screen.id];
+                VMSVGASCREENOBJECT *pScreen = &pThis->svga.pSvgaR3State->aScreens[idScreen];
+
+                bool const fBlank = RT_BOOL(pCmd->screen.flags & (SVGA_SCREEN_DEACTIVATE | SVGA_SCREEN_BLANKING));
+
                 pScreen->fDefined  = true;
                 pScreen->fModified = true;
                 pScreen->fuScreen  = pCmd->screen.flags;
-                pScreen->idScreen  = pCmd->screen.id;
-                pScreen->xOrigin   = pCmd->screen.root.x;
-                pScreen->yOrigin   = pCmd->screen.root.y;
-                pScreen->cWidth    = uWidth;
-                pScreen->cHeight   = uHeight;
-                pScreen->offVRAM   = uScreenOffset;
-                pScreen->cbPitch   = cbPitch;
-                pScreen->cBpp      = 32;
+                pScreen->idScreen  = idScreen;
+                if (!fBlank)
+                {
+                    AssertBreak(uWidth > 0 && uHeight > 0);
+
+                    pScreen->xOrigin = pCmd->screen.root.x;
+                    pScreen->yOrigin = pCmd->screen.root.y;
+                    pScreen->cWidth  = uWidth;
+                    pScreen->cHeight = uHeight;
+                    pScreen->offVRAM = uScreenOffset;
+                    pScreen->cbPitch = cbPitch;
+                    pScreen->cBpp    = 32;
+                }
+                else
+                {
+                    /* Keep old values. */
+                }
 
                 pThis->svga.fGFBRegisters = false;
@@ -3846 +3861 @@
 
                 Log(("vmsvgaFIFOLoop: SVGA_CMD_DESTROY_SCREEN id=%x\n", pCmd->screenId));
-                AssertBreak(pCmd->screenId < RT_ELEMENTS(pThis->svga.pSvgaR3State->aScreens));
+
+                uint32_t const idScreen = pCmd->screenId;
+                AssertBreak(idScreen < RT_ELEMENTS(pThis->svga.pSvgaR3State->aScreens));
                 RT_UNTRUSTED_VALIDATED_FENCE();
 
-                VMSVGASCREENOBJECT *pScreen = &pThis->svga.pSvgaR3State->aScreens[pCmd->screenId];
+                VMSVGASCREENOBJECT *pScreen = &pThis->svga.pSvgaR3State->aScreens[idScreen];
                 pScreen->fModified = true;
                 pScreen->fDefined  = false;
+                pScreen->idScreen  = idScreen;
 
                 vmsvgaChangeMode(pThis);