Changeset 104874 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 10, 2024 10:09:38 AM (7 months ago)

Author:

vboxsync

Message:

3D: Quick fix implementing all kinds of memory transfers using host GPU hardware resources and DX API

File:

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

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

@@ -4580 +4580 @@
                                uint32_t cCopyBoxes, SVGA3dCopyBox *pBox)
 {
-    RT_NOREF(cCopyBoxes, pBox);
+    RT_NOREF(cCopyBoxes);
+    AssertReturn(pBox, VERR_INVALID_PARAMETER);
 
     LogFunc(("src sid %d -> dst sid %d\n", src.sid, dest.sid));
@@ -4597 +4598 @@
     AssertRCReturn(rc, rc);
 
+/** @todo Implement a separate code paths for memory->texture, texture->memory and memory->memory transfers */
     LogFunc(("src%s sid = %u -> dst%s sid = %u\n",
              pSrcSurface->pBackendSurface ? "" : " sysmem", pSrcSurface->id,
@@ -4604 +4606 @@
     //AssertReturn(pDevice->pDevice, VERR_INVALID_STATE);
 
-    if (pSrcSurface->pBackendSurface)
-    {
-        if (pDstSurface->pBackendSurface == NULL)
-        {
-            rc = vmsvga3dBackSurfaceCreateTexture(pThisCC, pDstSurface);
-            AssertRCReturn(rc, rc);
-        }
-
-        if (pDstSurface->pBackendSurface)
-        {
-            /* Surface -> Surface. */
-            DXDEVICE *pDXDevice = &pBackend->dxDevice;
-
-            /* Clip the box. */
-            PVMSVGA3DMIPMAPLEVEL pSrcMipLevel;
-            rc = vmsvga3dMipmapLevel(pSrcSurface, src.face, src.mipmap, &pSrcMipLevel);
-            ASSERT_GUEST_RETURN(RT_SUCCESS(rc), rc);
-
-            PVMSVGA3DMIPMAPLEVEL pDstMipLevel;
-            rc = vmsvga3dMipmapLevel(pDstSurface, dest.face, dest.mipmap, &pDstMipLevel);
-            ASSERT_GUEST_RETURN(RT_SUCCESS(rc), rc);
-
-            SVGA3dCopyBox clipBox = *pBox;
-            vmsvgaR3ClipCopyBox(&pSrcMipLevel->mipmapSize, &pDstMipLevel->mipmapSize, &clipBox);
-
-            UINT DstSubresource = vmsvga3dCalcSubresource(dest.mipmap, dest.face, pDstSurface->cLevels);
-            UINT DstX = clipBox.x;
-            UINT DstY = clipBox.y;
-            UINT DstZ = clipBox.z;
-
-            UINT SrcSubresource = vmsvga3dCalcSubresource(src.mipmap, src.face, pSrcSurface->cLevels);
-            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;
-
-            Assert(cCopyBoxes == 1); /** @todo */
-
-            ID3D11Resource *pDstResource;
-            ID3D11Resource *pSrcResource;
-            pDstResource = dxResource(pDstSurface);
-            pSrcResource = dxResource( pSrcSurface);
-
-            pDXDevice->pImmediateContext->CopySubresourceRegion(pDstResource, DstSubresource, DstX, DstY, DstZ,
-                                                                pSrcResource, SrcSubresource, &SrcBox);
-        }
-        else
-        {
-            /* Surface -> Memory. */
-            AssertFailed(); /** @todo implement */
-        }
-    }
-    else
-    {
-        /* Memory -> Surface. */
-        AssertFailed(); /** @todo implement */
-    }
+    if (pSrcSurface->pBackendSurface == NULL)
+    {
+        rc = vmsvga3dBackSurfaceCreateTexture(pThisCC, pSrcSurface);
+        AssertRCReturn(rc, rc);
+    }
+
+    if (pDstSurface->pBackendSurface == NULL)
+    {
+        rc = vmsvga3dBackSurfaceCreateTexture(pThisCC, pDstSurface);
+        AssertRCReturn(rc, rc);
+    }
+
+    DXDEVICE *pDXDevice = &pBackend->dxDevice;
+
+    /* Clip the box. */
+    PVMSVGA3DMIPMAPLEVEL pSrcMipLevel;
+    rc = vmsvga3dMipmapLevel(pSrcSurface, src.face, src.mipmap, &pSrcMipLevel);
+    ASSERT_GUEST_RETURN(RT_SUCCESS(rc), rc);
+
+    PVMSVGA3DMIPMAPLEVEL pDstMipLevel;
+    rc = vmsvga3dMipmapLevel(pDstSurface, dest.face, dest.mipmap, &pDstMipLevel);
+    ASSERT_GUEST_RETURN(RT_SUCCESS(rc), rc);
+
+    SVGA3dCopyBox clipBox = *pBox;
+    vmsvgaR3ClipCopyBox(&pSrcMipLevel->mipmapSize, &pDstMipLevel->mipmapSize, &clipBox);
+
+    UINT DstSubresource = vmsvga3dCalcSubresource(dest.mipmap, dest.face, pDstSurface->cLevels);
+    UINT DstX = clipBox.x;
+    UINT DstY = clipBox.y;
+    UINT DstZ = clipBox.z;
+
+    UINT SrcSubresource = vmsvga3dCalcSubresource(src.mipmap, src.face, pSrcSurface->cLevels);
+    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;
+
+    Assert(cCopyBoxes == 1); /** @todo */
+
+    ID3D11Resource *pDstResource;
+    ID3D11Resource *pSrcResource;
+    pDstResource = dxResource(pDstSurface);
+    pSrcResource = dxResource(pSrcSurface);
+
+    pDXDevice->pImmediateContext->CopySubresourceRegion(pDstResource, DstSubresource, DstX, DstY, DstZ,
+                                                        pSrcResource, SrcSubresource, &SrcBox);
 
     return rc;