Changeset 73197 in vbox

Timestamp:

Jul 18, 2018 10:54:12 AM (6 years ago)

Author:

vboxsync

Message:

DevVGA-SVGA: implemented SVGA_CMD_BLIT_SCREEN_TO_GMRFB

File:

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

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

@@ -3755 +3755 @@
             case SVGA_CMD_BLIT_GMRFB_TO_SCREEN:
             {
-                uint32_t width, height;
                 SVGAFifoCmdBlitGMRFBToScreen *pCmd;
                 VMSVGAFIFO_GET_CMD_BUFFER_BREAK(pCmd, SVGAFifoCmdBlitGMRFBToScreen, sizeof(*pCmd));
@@ -3770 +3769 @@
                 /* Clip destRect to the screen dimensions. */
                 SVGASignedRect screenRect;
-                screenRect.left  = 0;
-                screenRect.top   = 0;
-                screenRect.right = pThis->svga.uWidth;
-                screenRect.top   = pThis->svga.uHeight;
+                screenRect.left   = 0;
+                screenRect.top    = 0;
+                screenRect.right  = pThis->svga.uWidth;
+                screenRect.bottom = pThis->svga.uHeight;
                 SVGASignedRect clipRect = pCmd->destRect;
                 vmsvgaClipRect(&screenRect, &clipRect);
                 RT_UNTRUSTED_VALIDATED_FENCE();
 
-                width  = clipRect.right - clipRect.left;
-                height = clipRect.bottom - clipRect.top;
+                uint32_t const width  = clipRect.right - clipRect.left;
+                uint32_t const height = clipRect.bottom - clipRect.top;
 
                 if (   width == 0
@@ -3826 +3825 @@
 
                 /* Note! This can fetch 3d render results as well!! */
-                Log(("vmsvgaFIFOLoop: SVGA_CMD_BLIT_SCREEN_TO_GMRFB dest=(%d,%d) src id=%d (%d,%d)(%d,%d)\n", pCmd->destOrigin.x, pCmd->destOrigin.y, pCmd->srcScreenId, pCmd->srcRect.left, pCmd->srcRect.top, pCmd->srcRect.right, pCmd->srcRect.bottom));
-                AssertFailed();
+                LogFunc(("SVGA_CMD_BLIT_SCREEN_TO_GMRFB dest=(%d,%d) src id=%d (%d,%d)(%d,%d)\n",
+                         pCmd->destOrigin.x, pCmd->destOrigin.y, pCmd->srcScreenId, pCmd->srcRect.left, pCmd->srcRect.top, pCmd->srcRect.right, pCmd->srcRect.bottom));
+
+                /** @todo Support GMRFB.format.s.bitsPerPixel != pThis->svga.uBpp?   */
+                AssertBreak(pSVGAState->GMRFB.format.s.bitsPerPixel == pThis->svga.uBpp);
+                /** @todo Multimonitor. */
+                AssertBreak(pCmd->srcScreenId == 0);
+
+                /* Clip destRect to the screen dimensions. */
+                SVGASignedRect screenRect;
+                screenRect.left   = 0;
+                screenRect.top    = 0;
+                screenRect.right  = pThis->svga.uWidth;
+                screenRect.bottom = pThis->svga.uHeight;
+                SVGASignedRect clipRect = pCmd->srcRect;
+                vmsvgaClipRect(&screenRect, &clipRect);
+                RT_UNTRUSTED_VALIDATED_FENCE();
+
+                uint32_t const width  = clipRect.right - clipRect.left;
+                uint32_t const height = clipRect.bottom - clipRect.top;
+
+                if (   width == 0
+                    || height == 0)
+                    break;  /* Nothing to do. */
+
+                int32_t const dstx = pCmd->destOrigin.x + (clipRect.left - pCmd->srcRect.left);
+                int32_t const dsty = pCmd->destOrigin.y + (clipRect.top - pCmd->srcRect.top);
+
+                /* Copy the defined by GMRFB image to the screen 0 VRAM area.
+                 * Prepare parameters for vmsvgaGMRTransfer.
+                 */
+                AssertBreak(pThis->svga.uScreenOffset < pThis->vram_size); /* Paranoia. Ensured by SVGA_CMD_DEFINE_SCREEN. */
+
+                /* Source: host buffer which describes the screen 0 VRAM.
+                 * Important are pbHstBuf and cbHstBuf. offHst and cbHstPitch are verified by vmsvgaGMRTransfer.
+                 */
+                uint8_t * const pbHstBuf = (uint8_t *)pThis->CTX_SUFF(vram_ptr) + pThis->svga.uScreenOffset;
+                uint32_t cbHstBuf = pThis->svga.cbScanline * pThis->svga.uHeight;
+                if (cbHstBuf > pThis->vram_size - pThis->svga.uScreenOffset)
+                   cbHstBuf = pThis->vram_size - pThis->svga.uScreenOffset; /* Paranoia. */
+                uint32_t const offHst =   (clipRect.left * RT_ALIGN(pThis->svga.uBpp, 8)) / 8
+                                        + pThis->svga.cbScanline * clipRect.top;
+                int32_t const cbHstPitch = pThis->svga.cbScanline;
+
+                /* Destination: GMRFB. vmsvgaGMRTransfer ensures that no memory outside the GMR is read. */
+                SVGAGuestPtr const gstPtr = pSVGAState->GMRFB.ptr;
+                uint32_t const offGst =  (dstx * RT_ALIGN(pSVGAState->GMRFB.format.s.bitsPerPixel, 8)) / 8
+                                       + pSVGAState->GMRFB.bytesPerLine * dsty;
+                int32_t const cbGstPitch = pSVGAState->GMRFB.bytesPerLine;
+
+                rc = vmsvgaGMRTransfer(pThis, SVGA3D_READ_HOST_VRAM,
+                                       pbHstBuf, cbHstBuf, offHst, cbHstPitch,
+                                       gstPtr, offGst, cbGstPitch,
+                                       (width * RT_ALIGN(pThis->svga.uBpp, 8)) / 8, height);
+                AssertRC(rc);
                 break;
             }