Changeset 107829 in vbox for trunk/src/VBox/Devices

Timestamp:

Jan 16, 2025 7:21:04 PM (3 weeks ago)

Author:

vboxsync

Message:

3D: The command SVGA_CMD_UPDATE implemented to support multiple monitors. bugref:10831

File:

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

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

@@ -7251 +7251 @@
     Log(("SVGA_CMD_UPDATE %d,%d %dx%d\n", pCmd->x, pCmd->y, pCmd->width, pCmd->height));
 
-    /** @todo Multiple screens? */
-    VMSVGASCREENOBJECT *pScreen = vmsvgaR3GetScreenObject(pThisCC, 0);
-    if (!pScreen) /* Can happen if screen is not defined (aScreens[idScreen].fDefined == false) yet. */
-        return;
-
-    vmsvgaR3UpdateScreen(pThisCC, pScreen, pCmd->x, pCmd->y, pCmd->width, pCmd->height);
+    /* These conditions are too strict but prevent any further integer overflow */
+    ASSERT_GUEST_RETURN_VOID(pCmd->x < pThis->svga.u32MaxWidth);
+    ASSERT_GUEST_RETURN_VOID(pCmd->y < pThis->svga.u32MaxHeight);
+    ASSERT_GUEST_RETURN_VOID(pCmd->width  < pThis->svga.u32MaxWidth);
+    ASSERT_GUEST_RETURN_VOID(pCmd->height < pThis->svga.u32MaxHeight);
+    RT_UNTRUSTED_VALIDATED_FENCE();
+
+    for (uint32_t idScreen = 0; idScreen < (uint32_t)RT_ELEMENTS(pSvgaR3State->aScreens); idScreen++)
+    {
+        VMSVGASCREENOBJECT *pScreen = vmsvgaR3GetScreenObject(pThisCC, idScreen);
+        if (!pScreen) /* Can happen if screen is not defined (aScreens[idScreen].fDefined == false) yet. */
+            continue;
+
+        /* Clip updated Rect to the screen dimensions. */
+        SVGASignedRect screenRect;
+        screenRect.left   = pScreen->xOrigin;
+        screenRect.top    = pScreen->yOrigin;
+        screenRect.right  = pScreen->xOrigin + pScreen->cWidth;
+        screenRect.bottom = pScreen->yOrigin + pScreen->cHeight;
+
+        SVGASignedRect clipRect;
+        clipRect.left = (int32)pCmd->x;
+        clipRect.top  = (int32)pCmd->y;
+        clipRect.right  = (int32)(pCmd->x + pCmd->width);
+        clipRect.bottom = (int32)(pCmd->y + pCmd->height);
+        vmsvgaR3ClipRect(&screenRect, &clipRect);
+
+        if (clipRect.left == clipRect.right || clipRect.top == clipRect.bottom)
+            continue;
+
+        vmsvgaR3UpdateScreen(pThisCC, pScreen,
+            clipRect.left - screenRect.left,
+            clipRect.top  - screenRect.top,
+            clipRect.right  - clipRect.left,
+            clipRect.bottom - clipRect.top);
+    }
 }
 
@@ -7263 +7293 @@
 void vmsvgaR3CmdUpdateVerbose(PVGASTATE pThis, PVGASTATECC pThisCC, SVGAFifoCmdUpdateVerbose const *pCmd)
 {
-    RT_NOREF(pThis);
     PVMSVGAR3STATE const pSvgaR3State = pThisCC->svga.pSvgaR3State;
 
@@ -7269 +7298 @@
     Log(("SVGA_CMD_UPDATE_VERBOSE %d,%d %dx%d reason %#x\n", pCmd->x, pCmd->y, pCmd->width, pCmd->height, pCmd->reason));
 
-    /** @todo Multiple screens? */
-    VMSVGASCREENOBJECT *pScreen = vmsvgaR3GetScreenObject(pThisCC, 0);
-    if (!pScreen) /* Can happen if screen is not defined (aScreens[idScreen].fDefined == false) yet. */
-        return;
-
-    vmsvgaR3UpdateScreen(pThisCC, pScreen, pCmd->x, pCmd->y, pCmd->width, pCmd->height);
+    /* Just like SVGA_CMD_UPDATE, but also provides a per-rectangle 'reason' value */
+    vmsvgaR3CmdUpdate(pThis, pThisCC, (SVGAFifoCmdUpdate const *)pCmd);
 }