Changeset 75715 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d.cpp

Timestamp:

Nov 25, 2018 3:59:10 PM (6 years ago)

Author:

vboxsync

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

126914

Message:

Device/Graphics: multiple screens for VMSVGA.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d.cpp (modified) (6 diffs)

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

@@ -816 +816 @@
     }
 
-    /** @todo Only screen 0 for now. */
-    AssertReturn(idDstScreen == 0, VERR_INTERNAL_ERROR);
+    VMSVGASCREENOBJECT *pScreen = vmsvgaGetScreenObject(pThis, idDstScreen);
+    AssertReturn(pScreen, VERR_INTERNAL_ERROR);
+
     AssertReturn(src.mipmap == 0 && src.face == 0, VERR_INVALID_PARAMETER);
     /** @todo scaling */
@@ -829 +830 @@
     box.d    = 1;
 
-    /** @todo SVGA_GMR_FRAMEBUFFER is not the screen object
-     * and might not point to the start of VRAM as assumed here.
-     */
     dest.ptr.gmrId  = SVGA_GMR_FRAMEBUFFER;
-    dest.ptr.offset = pThis->svga.uScreenOffset;
-    dest.pitch      = pThis->svga.cbScanline;
+    dest.ptr.offset = pScreen->offVRAM;
+    dest.pitch      = pScreen->cbPitch;
 
     if (cRects == 0)
@@ -861 +859 @@
 
         /* Update the guest image, which is at box.src. */
-        vgaR3UpdateDisplay(pThis, box.srcx, box.srcy, box.w, box.h);
+        vmsvgaUpdateScreen(pThis, pScreen, box.srcx, box.srcy, box.w, box.h);
     }
     else
@@ -886 +884 @@
 
             /* Update the guest image, which is at box.src. */
-            vgaR3UpdateDisplay(pThis, box.srcx, box.srcy, box.w, box.h);
+            vmsvgaUpdateScreen(pThis, pScreen, box.srcx, box.srcy, box.w, box.h);
         }
     }
@@ -902 +900 @@
     int rc = vmsvga3dSurfaceFromSid(pState, sid, &pSurface);
     AssertRCReturn(rc, rc);
+
+    /** @todo Detect screen from coords? Or split rect to screens? */
+    VMSVGASCREENOBJECT *pScreen = vmsvgaGetScreenObject(pThis, 0);
+    AssertReturn(pScreen, VERR_INTERNAL_ERROR);
 
     /* If there are no recangles specified, just grab a screenful. */
@@ -915 +917 @@
         DummyRect.x = DummyRect.srcx = 0;
         DummyRect.y = DummyRect.srcy = 0;
-        DummyRect.w = pThis->svga.uWidth;
-        DummyRect.h = pThis->svga.uHeight;
+        DummyRect.w = pScreen->cWidth;
+        DummyRect.h = pScreen->cHeight;
         cRects = 1;
         pRect  = &DummyRect;