Changeset 28220 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA.cpp

Timestamp:

Apr 12, 2010 5:04:54 PM (15 years ago)

Author:

vboxsync

Message:

IDisplay::DrawToScreen for multimonitor (xTracker 4655)

File:

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

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

@@ -5304 +5304 @@
 }
 
-static DECLCALLBACK(void) vgaPortUpdateDisplayRectEx (PPDMIDISPLAYPORT pInterface,
-                                                      int32_t x,
-                                                      int32_t y,
-                                                      uint32_t w,
-                                                      uint32_t h,
-                                                      const uint8_t *pu8SrcVRAM,
-                                                      uint32_t u32SrcWidth,
-                                                      uint32_t u32SrcHeight,
-                                                      uint32_t u32SrcLineSize,
-                                                      uint32_t u32SrcBitsPerPixel,
-                                                      uint8_t *pu8DstBuffer,
-                                                      uint32_t u32DstWidth,
-                                                      uint32_t u32DstHeight,
-                                                      uint32_t u32DstLineSize,
-                                                      uint32_t u32DstBitsPerPixel)
-{
-    NOREF(u32DstWidth);
-    NOREF(u32DstHeight);
-
+static DECLCALLBACK(int) vgaPortCopyRect (PPDMIDISPLAYPORT pInterface,
+                                          uint32_t w,
+                                          uint32_t h,
+                                          const uint8_t *pu8Src,
+                                          int32_t xSrc,
+                                          int32_t ySrc,
+                                          uint32_t u32SrcWidth,
+                                          uint32_t u32SrcHeight,
+                                          uint32_t u32SrcLineSize,
+                                          uint32_t u32SrcBitsPerPixel,
+                                          uint8_t *pu8Dst,
+                                          int32_t xDst,
+                                          int32_t yDst,
+                                          uint32_t u32DstWidth,
+                                          uint32_t u32DstHeight,
+                                          uint32_t u32DstLineSize,
+                                          uint32_t u32DstBitsPerPixel)
+{
     uint32_t v;
     vga_draw_line_func *vga_draw_line;
@@ -5328 +5327 @@
     uint32_t cbPixelDst;
     uint32_t cbLineDst;
-    uint8_t *pu8Dst;
+    uint8_t *pu8DstPtr;
 
     uint32_t cbPixelSrc;
     uint32_t cbLineSrc;
-    const uint8_t *pu8Src;
-
-    uint32_t u32OffsetSrc, u32Dummy;
+    const uint8_t *pu8SrcPtr;
+
+#ifdef DEBUG_sunlover
+    LogFlow(("vgaPortCopyRect: %d,%d %dx%d -> %d,%d\n", xSrc, ySrc, w, h, xDst, yDst));
+#endif /* DEBUG_sunlover */
 
     PVGASTATE s = IDISPLAYPORT_2_VGASTATE(pInterface);
-
-#ifdef DEBUG_sunlover
-    LogFlow(("vgaPortUpdateDisplayRectEx: %d,%d %dx%d\n", x, y, w, h));
-#endif /* DEBUG_sunlover */
 
     Assert(pInterface);
     Assert(s->pDrv);
 
-    int rc = PDMCritSectEnter(&s->lock, VERR_SEM_BUSY);
-    AssertRC(rc);
-
-    /* Correct negative x and y coordinates. */
-    if (x < 0)
-    {
-        x += w; /* Compute xRight which is also the new width. */
-        w = (x < 0) ? 0 : x;
-        x = 0;
-    }
-
-    if (y < 0)
-    {
-        y += h; /* Compute yBottom, which is also the new height. */
-        h = (y < 0) ? 0 : y;
-        y = 0;
+    int32_t xSrcCorrected = xSrc;
+    int32_t ySrcCorrected = ySrc;
+    uint32_t wCorrected = w;
+    uint32_t hCorrected = h;
+
+    /* Correct source coordinates to be within the source bitmap. */
+    if (xSrcCorrected < 0)
+    {
+        xSrcCorrected += wCorrected; /* Compute xRight which is also the new width. */
+        wCorrected = (xSrcCorrected < 0) ? 0 : xSrcCorrected;
+        xSrcCorrected = 0;
+    }
+
+    if (ySrcCorrected < 0)
+    {
+        ySrcCorrected += hCorrected; /* Compute yBottom, which is also the new height. */
+        hCorrected = (ySrcCorrected < 0) ? 0 : ySrcCorrected;
+        ySrcCorrected = 0;
     }
 
     /* Also check if coords are greater than the display resolution. */
-    if (x + w > u32SrcWidth)
-    {
-        // x < 0 is not possible here
-        w = u32SrcWidth > (uint32_t)x? u32SrcWidth - x: 0;
-    }
-
-    if (y + h > u32SrcHeight)
-    {
-        // y < 0 is not possible here
-        h = u32SrcHeight > (uint32_t)y? u32SrcHeight - y: 0;
+    if (xSrcCorrected + wCorrected > u32SrcWidth)
+    {
+        /* xSrcCorrected < 0 is not possible here */
+        wCorrected = u32SrcWidth > (uint32_t)xSrcCorrected? u32SrcWidth - xSrcCorrected: 0;
+    }
+
+    if (ySrcCorrected + hCorrected > u32SrcHeight)
+    {
+        /* y < 0 is not possible here */
+        hCorrected = u32SrcHeight > (uint32_t)ySrcCorrected? u32SrcHeight - ySrcCorrected: 0;
     }
 
 #ifdef DEBUG_sunlover
-    LogFlow(("vgaPortUpdateDisplayRectEx: %d,%d %dx%d (corrected coords)\n", x, y, w, h));
+    LogFlow(("vgaPortCopyRect: %d,%d %dx%d (corrected coords)\n", xSrcCorrected, ySrcCorrected, wCorrected, hCorrected));
 #endif /* DEBUG_sunlover */
 
     /* Check if there is something to do at all. */
-    if (w == 0 || h == 0)
+    if (wCorrected == 0 || hCorrected == 0)
     {
         /* Empty rectangle. */
 #ifdef DEBUG_sunlover
-        LogFlow(("vgaPortUpdateDisplayRectEx: nothing to do: %dx%d\n", w, h));
+        LogFlow(("vgaPortUpdateDisplayRectEx: nothing to do: %dx%d\n", wCorrected, hCorrected));
 #endif /* DEBUG_sunlover */
-        PDMCritSectLeave(&s->lock);
-        return;
+        return VINF_SUCCESS;
+    }
+
+    /* Check that the corrected source rectangle is within the destination.
+     * Note: source rectangle is adjusted, but the target must be large enough.
+     */
+    if (   xDst < 0
+        || yDst < 0
+        || xDst + wCorrected > u32DstWidth
+        || yDst + hCorrected > u32SrcHeight)
+    {
+        return VERR_INVALID_PARAMETER;
     }
 
@@ -5397 +5406 @@
         case 0:
             /* Nothing to do, just return. */
-            PDMCritSectLeave(&s->lock);
-            return;
+            return VINF_SUCCESS;
         case 8:
             v = VGA_DRAW_LINE8;
@@ -5415 +5423 @@
             break;
     }
+
+    int rc = PDMCritSectEnter(&s->lock, VERR_SEM_BUSY);
+    AssertRC(rc);
 
     vga_draw_line = vga_draw_line_table[v * 4 + get_depth_index(u32DstBitsPerPixel)];
@@ -5421 +5432 @@
     cbPixelDst = (u32DstBitsPerPixel + 7) / 8;
     cbLineDst  = u32DstLineSize;
-    pu8Dst     = pu8DstBuffer + y * cbLineDst + x * cbPixelDst;
+    pu8DstPtr  = pu8Dst + yDst * cbLineDst + xDst * cbPixelDst;
 
     cbPixelSrc = (u32SrcBitsPerPixel + 7) / 8;
     cbLineSrc = u32SrcLineSize;
-
-    pu8Src = pu8SrcVRAM;
-    pu8Src += y * cbLineSrc + x * cbPixelSrc;
-
-    /* Render VRAM to the buffer. */
+    pu8SrcPtr = pu8Src + ySrcCorrected * cbLineSrc + xSrcCorrected * cbPixelSrc;
 
 #ifdef DEBUG_sunlover
-    LogFlow(("vgaPortUpdateDisplayRectEx: dst: %p, %d, %d. src: %p, %d, %d\n", pu8Dst, cbLineDst, cbPixelDst, pu8Src, cbLineSrc, cbPixelSrc));
+    LogFlow(("vgaPortCopyRect: dst: %p, %d, %d. src: %p, %d, %d\n", pu8DstPtr, cbLineDst, cbPixelDst, pu8SrcPtr, cbLineSrc, cbPixelSrc));
 #endif /* DEBUG_sunlover */
 
-    while (h-- > 0)
-    {
-        vga_draw_line (s, pu8Dst, pu8Src, w);
-        pu8Dst += cbLineDst;
-        pu8Src += cbLineSrc;
+    while (hCorrected-- > 0)
+    {
+        vga_draw_line (s, pu8DstPtr, pu8SrcPtr, wCorrected);
+        pu8DstPtr += cbLineDst;
+        pu8SrcPtr += cbLineSrc;
     }
     PDMCritSectLeave(&s->lock);
 
 #ifdef DEBUG_sunlover
-    LogFlow(("vgaPortUpdateDisplayRectEx: completed.\n"));
+    LogFlow(("vgaPortCopyRect: completed.\n"));
 #endif /* DEBUG_sunlover */
+
+    return VINF_SUCCESS;
 }
 
@@ -6118 +6127 @@
     pThis->IPort.pfnDisplayBlt          = vgaPortDisplayBlt;
     pThis->IPort.pfnUpdateDisplayRect   = vgaPortUpdateDisplayRect;
-    pThis->IPort.pfnUpdateDisplayRectEx = vgaPortUpdateDisplayRectEx;
+    pThis->IPort.pfnCopyRect            = vgaPortCopyRect;
     pThis->IPort.pfnSetRenderVRAM       = vgaPortSetRenderVRAM;