Changeset 99589 in vbox

Timestamp:

May 3, 2023 3:56:34 PM (2 years ago)

Author:

vboxsync

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

157106

Message:

Devices/Graphics: SVGA_3D_CMD_INTRA_SURFACE_COPY. bugref:9830

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA-cmd.cpp (modified) (1 diff)
• DevVGA-SVGA.cpp (modified) (1 diff)
• DevVGA-SVGA3d-dx-dx11.cpp (modified) (1 diff)
• DevVGA-SVGA3d-dx.cpp (modified) (2 diffs)
• DevVGA-SVGA3d.h (modified) (2 diffs)

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

@@ -3581 +3581 @@
 {
 #ifdef VMSVGA3D_DX
-    DEBUG_BREAKPOINT_TEST();
-    PVMSVGAR3STATE const pSvgaR3State = pThisCC->svga.pSvgaR3State;
-    RT_NOREF(pSvgaR3State, pCmd, cbCmd);
-    return vmsvga3dIntraSurfaceCopy(pThisCC, idDXContext);
+    //DEBUG_BREAKPOINT_TEST();
+    RT_NOREF(cbCmd);
+    return vmsvga3dIntraSurfaceCopy(pThisCC, idDXContext, pCmd);
 #else
     RT_NOREF(pThisCC, idDXContext, pCmd, cbCmd);

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

@@ -6456 +6456 @@
            if (*pu32DeviceCaps & SVGA_CAP_CAP2_REGISTER)
                *pu32DeviceCaps2 |= SVGA_CAP2_GROW_OTABLE  /* "Allow the GrowOTable/DXGrowCOTable commands" */
+                                |  SVGA_CAP2_INTRA_SURFACE_COPY /* "IntraSurfaceCopy command" */
                                 |  SVGA_CAP2_DX2          /* Shader Model 4.1.
                                                            * "Allow the DefineGBSurface_v3, WholeSurfaceCopy, WriteZeroSurface, and

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

@@ -9477 +9477 @@
 
 
-static DECLCALLBACK(int) vmsvga3dBackIntraSurfaceCopy(PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext)
-{
-    PVMSVGA3DBACKEND pBackend = pThisCC->svga.p3dState->pBackend;
-
-    RT_NOREF(pBackend, pDXContext);
-    AssertFailed(); /** @todo Implement */
-    return VERR_NOT_IMPLEMENTED;
+static DECLCALLBACK(int) vmsvga3dBackIntraSurfaceCopy(PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext, SVGA3dSurfaceImageId const &surface, SVGA3dCopyBox const &box)
+{
+    RT_NOREF(pDXContext);
+
+    LogFunc(("sid %u\n", surface.sid));
+
+    PVMSVGA3DSTATE pState = pThisCC->svga.p3dState;
+    AssertReturn(pState, VERR_INVALID_STATE);
+
+    PVMSVGA3DBACKEND pBackend = pState->pBackend;
+
+    PVMSVGA3DSURFACE pSurface;
+    int rc = vmsvga3dSurfaceFromSid(pThisCC->svga.p3dState, surface.sid, &pSurface);
+    AssertRCReturn(rc, rc);
+
+    PVMSVGA3DMIPMAPLEVEL pMipLevel;
+    rc = vmsvga3dMipmapLevel(pSurface, surface.face, surface.mipmap, &pMipLevel);
+    ASSERT_GUEST_RETURN(RT_SUCCESS(rc), rc);
+
+    /* Clip the box. */
+    SVGA3dCopyBox clipBox = box;
+    vmsvgaR3ClipCopyBox(&pMipLevel->mipmapSize, &pMipLevel->mipmapSize, &clipBox);
+
+    LogFunc(("surface%s cid %d\n",
+             pSurface->pBackendSurface ? "" : " sysmem",
+             pSurface ? pSurface->idAssociatedContext : SVGA_ID_INVALID));
+
+    if (pSurface->pBackendSurface)
+    {
+        /* Surface -> Surface. */
+        DXDEVICE *pDXDevice = &pBackend->dxDevice;
+
+        UINT DstSubresource = vmsvga3dCalcSubresource(surface.mipmap, surface.face, pSurface->cLevels);
+        UINT DstX = clipBox.x;
+        UINT DstY = clipBox.y;
+        UINT DstZ = clipBox.z;
+
+        UINT SrcSubresource = DstSubresource;
+        D3D11_BOX SrcBox;
+        SrcBox.left   = clipBox.srcx;
+        SrcBox.top    = clipBox.srcy;
+        SrcBox.front  = clipBox.srcz;
+        SrcBox.right  = clipBox.srcx + clipBox.w;
+        SrcBox.bottom = clipBox.srcy + clipBox.h;
+        SrcBox.back   = clipBox.srcz + clipBox.d;
+
+        ID3D11Resource *pDstResource;
+        ID3D11Resource *pSrcResource;
+        pDstResource = dxResource(pState, pSurface, NULL);
+        pSrcResource = pDstResource;
+
+        pDXDevice->pImmediateContext->CopySubresourceRegion1(pDstResource, DstSubresource, DstX, DstY, DstZ,
+                                                             pSrcResource, SrcSubresource, &SrcBox, 0);
+    }
+    else
+    {
+        /* Memory -> Memory. */
+        uint32_t const cxBlocks = (clipBox.w + pSurface->cxBlock - 1) / pSurface->cxBlock;
+        uint32_t const cyBlocks = (clipBox.h + pSurface->cyBlock - 1) / pSurface->cyBlock;
+        uint32_t const cbRow = cxBlocks * pSurface->cbBlock;
+
+        uint8_t const *pu8Src = (uint8_t *)pMipLevel->pSurfaceData
+                        + (clipBox.srcx / pSurface->cxBlock) * pSurface->cbBlock
+                        + (clipBox.srcy / pSurface->cyBlock) * pMipLevel->cbSurfacePitch
+                        + clipBox.srcz * pMipLevel->cbSurfacePlane;
+
+        uint8_t *pu8Dst = (uint8_t *)pMipLevel->pSurfaceData
+                        + (clipBox.x / pSurface->cxBlock) * pSurface->cbBlock
+                        + (clipBox.y / pSurface->cyBlock) * pMipLevel->cbSurfacePitch
+                        + clipBox.z * pMipLevel->cbSurfacePlane;
+
+        for (uint32_t z = 0; z < clipBox.d; ++z)
+        {
+            uint8_t const *pu8PlaneSrc = pu8Src;
+            uint8_t *pu8PlaneDst = pu8Dst;
+
+            for (uint32_t y = 0; y < clipBox.h; ++y)
+            {
+                memmove(pu8PlaneDst, pu8PlaneSrc, cbRow);
+                pu8PlaneDst += pMipLevel->cbSurfacePitch;
+                pu8PlaneSrc += pMipLevel->cbSurfacePitch;
+            }
+
+            pu8Src += pMipLevel->cbSurfacePlane;
+            pu8Dst += pMipLevel->cbSurfacePlane;
+        }
+    }
+
+    return rc;
 }
 

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

@@ -2564 +2564 @@
 
 
-int vmsvga3dIntraSurfaceCopy(PVGASTATECC pThisCC, uint32_t idDXContext)
+int vmsvga3dIntraSurfaceCopy(PVGASTATECC pThisCC, uint32_t idDXContext, SVGA3dCmdIntraSurfaceCopy const *pCmd)
 {
     int rc;
@@ -2576 +2576 @@
     AssertRCReturn(rc, rc);
 
-    rc = pSvgaR3State->pFuncsDX->pfnIntraSurfaceCopy(pThisCC, pDXContext);
+    rc = pSvgaR3State->pFuncsDX->pfnIntraSurfaceCopy(pThisCC, pDXContext, pCmd->surface, pCmd->box);
     return rc;
 }

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

@@ -515 +515 @@
     DECLCALLBACKMEMBER(int, pfnDXCondBindAllShader,         (PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext));
     DECLCALLBACKMEMBER(int, pfnScreenCopy,                  (PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext));
-    DECLCALLBACKMEMBER(int, pfnIntraSurfaceCopy,            (PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext));
+    DECLCALLBACKMEMBER(int, pfnIntraSurfaceCopy,            (PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext, SVGA3dSurfaceImageId const &surface, SVGA3dCopyBox const &box));
     DECLCALLBACKMEMBER(int, pfnDXResolveCopy,               (PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext));
     DECLCALLBACKMEMBER(int, pfnDXPredResolveCopy,           (PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext));
@@ -635 +635 @@
 int vmsvga3dScreenCopy(PVGASTATECC pThisCC, uint32_t idDXContext);
 int vmsvga3dDXGrowCOTable(PVGASTATECC pThisCC, SVGA3dCmdDXGrowCOTable const *pCmd);
-int vmsvga3dIntraSurfaceCopy(PVGASTATECC pThisCC, uint32_t idDXContext);
+int vmsvga3dIntraSurfaceCopy(PVGASTATECC pThisCC, uint32_t idDXContext, SVGA3dCmdIntraSurfaceCopy const *pCmd);
 int vmsvga3dDXResolveCopy(PVGASTATECC pThisCC, uint32_t idDXContext);
 int vmsvga3dDXPredResolveCopy(PVGASTATECC pThisCC, uint32_t idDXContext);