Changeset 69884 in vbox

Timestamp:

Nov 30, 2017 4:38:18 PM (7 years ago)

Author:

vboxsync

Message:

Devices/Graphics: Use offsets instead of pointers as arguments in VDMA blitter

File:

• trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp (modified) (5 diffs)

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

@@ -2333 +2333 @@
 }
 
-static int vboxVDMACmdExecBltPerform(PVBOXVDMAHOST pVdma, uint8_t *pvDstSurf, const uint8_t *pvSrcSurf,
+static int vboxVDMACmdExecBltPerform(PVBOXVDMAHOST pVdma, const VBOXVIDEOOFFSET offDst, const VBOXVIDEOOFFSET offSrc,
                                      const PVBOXVDMA_SURF_DESC pDstDesc, const PVBOXVDMA_SURF_DESC pSrcDesc,
                                      const VBOXVDMA_RECTL * pDstRectl, const VBOXVDMA_RECTL * pSrcRectl)
 {
-    RT_NOREF(pVdma);
     /* we do not support color conversion */
     Assert(pDstDesc->format == pSrcDesc->format);
@@ -2343 +2342 @@
     Assert(pDstRectl->height == pSrcRectl->height);
     Assert(pDstRectl->width == pSrcRectl->width);
+
     if (pDstDesc->format != pSrcDesc->format)
         return VERR_INVALID_FUNCTION;
+
+    uint8_t *pvRam = pVdma->pVGAState->vram_ptrR3;
+    uint8_t *pvDstSurf = pvRam + offDst;
+    uint8_t *pvSrcSurf = pvRam + offSrc;
+
     if (pDstDesc->width == pDstRectl->width
             && pSrcDesc->width == pSrcRectl->width
-            && pSrcDesc->width == pDstDesc->width)
+            && pSrcDesc->width == pDstDesc->width
+            && pSrcDesc->pitch == pDstDesc->pitch)
     {
         Assert(!pDstRectl->left);
@@ -2436 +2442 @@
     Assert(pBlt->cDstSubRects);
 
-    uint8_t * pvRam = pVdma->pVGAState->vram_ptrR3;
     VBOXVDMA_RECTL updateRectl = {0, 0, 0, 0};
 
@@ -2452 +2457 @@
             srcSubRectl.top  += pBlt->srcRectl.top;
 
-            int rc = vboxVDMACmdExecBltPerform(pVdma, pvRam + pBlt->offDst, pvRam + pBlt->offSrc,
+            int rc = vboxVDMACmdExecBltPerform(pVdma, pBlt->offDst, pBlt->offSrc,
                     &pBlt->dstDesc, &pBlt->srcDesc,
                     &dstSubRectl,
@@ -2465 +2470 @@
     else
     {
-        int rc = vboxVDMACmdExecBltPerform(pVdma, pvRam + pBlt->offDst, pvRam + pBlt->offSrc,
+        int rc = vboxVDMACmdExecBltPerform(pVdma, pBlt->offDst, pBlt->offSrc,
                 &pBlt->dstDesc, &pBlt->srcDesc,
                 &pBlt->dstRectl,