Changeset 75751 in vbox

Timestamp:

Nov 26, 2018 7:38:38 PM (6 years ago)

Author:

vboxsync

Message:

DevVGA-SVGA3d-win.cpp: make vmsvga3dSurfaceCopy more flexible (now can copy compressed textures too).

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp (modified) (4 diffs)

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

@@ -1550 +1550 @@
 
             hr = pContextDst->pDevice->StretchRect(pSrc, &RectSrc, pDest, &RectDest, D3DTEXF_NONE);
+            if (hr != D3D_OK)
+            {
+                /* This can happen for compressed texture formats. */
+                LogFunc(("StretchRect failed with %x. Try a slow path.\n", hr));
+                if (   pSurfaceSrc->bounce.pTexture
+                    && (pSurfaceSrc->fUsageD3D & D3DUSAGE_RENDERTARGET))
+                {
+                    /* Copy the texture mipmap level to the bounce texture. */
+
+                    /* Source is the texture, destination is the corresponding bounce texture. */
+                    IDirect3DSurface9 *pBounceSurf;
+                    rc = vmsvga3dGetD3DSurface(pState, pContextDst, pSurfaceSrc, src.face, src.mipmap, true, &pBounceSurf);
+                    AssertRC(rc);
+                    if (RT_SUCCESS(rc))
+                    {
+                        Assert(pSrc != pBounceSurf);
+
+                        hr = pContextDst->pDevice->GetRenderTargetData(pSrc, pBounceSurf);
+                        Assert(hr == D3D_OK);
+                        if (SUCCEEDED(hr))
+                        {
+                            POINT pointDest;
+                            pointDest.x = clipBox.x;
+                            pointDest.y = clipBox.y;
+
+                            hr = pContextDst->pDevice->UpdateSurface(pBounceSurf, &RectSrc, pDest, &pointDest);
+                            Assert(hr == D3D_OK);
+                        }
+
+                        D3D_RELEASE(pBounceSurf);
+                    }
+                }
+                else if (   (pSurfaceSrc->fUsageD3D & D3DUSAGE_RENDERTARGET) == 0
+                         && (pSurfaceDest->fUsageD3D & D3DUSAGE_RENDERTARGET) == 0)
+                {
+                    /* Can lock both. */
+                    vmsvga3dSurfaceFlush(pThis, pSurfaceSrc);
+                    vmsvga3dSurfaceFlush(pThis, pSurfaceDest);
+
+                    D3DLOCKED_RECT LockedSrcRect;
+                    hr = pSrc->LockRect(&LockedSrcRect, &RectSrc, D3DLOCK_READONLY);
+                    Assert(hr == D3D_OK);
+                    if (SUCCEEDED(hr))
+                    {
+                        D3DLOCKED_RECT LockedDestRect;
+                        hr = pDest->LockRect(&LockedDestRect, &RectDest, 0);
+                        Assert(hr == D3D_OK);
+                        if (SUCCEEDED(hr))
+                        {
+                            uint32_t cBlocksX = (clipBox.w + pSurfaceSrc->cxBlock - 1) / pSurfaceSrc->cxBlock;
+                            uint32_t cBlocksY = (clipBox.h + pSurfaceSrc->cyBlock - 1) / pSurfaceSrc->cyBlock;
+
+                            uint32_t cbToCopy = cBlocksX * pSurfaceSrc->cbBlock;
+                            cbToCopy = RT_MIN(cbToCopy, (uint32_t)RT_ABS(LockedDestRect.Pitch));
+                            cbToCopy = RT_MIN(cbToCopy, (uint32_t)RT_ABS(LockedSrcRect.Pitch));
+
+                            uint8_t *pu8Dst = (uint8_t *)LockedDestRect.pBits;
+                            const uint8_t *pu8Src = (uint8_t *)LockedSrcRect.pBits;
+                            for (uint32_t j = 0; j < cBlocksY; ++j)
+                            {
+                                memcpy(pu8Dst, pu8Src, cbToCopy);
+                                pu8Dst += LockedDestRect.Pitch;
+                                pu8Src  += LockedSrcRect.Pitch;
+                            }
+
+                            hr = pDest->UnlockRect();
+                            Assert(hr == D3D_OK);
+                        }
+
+                        hr = pSrc->UnlockRect();
+                        Assert(hr == D3D_OK);
+                    }
+                }
+            }
             AssertMsgReturnStmt(hr == D3D_OK,
                                 ("StretchRect failed with %x\n", hr),
@@ -1739 +1813 @@
     HRESULT hr;
 
+    LogFunc(("sid=%x\n", pSurface->id));
+
     Assert(pSurface->hSharedObject == NULL);
     Assert(pSurface->u.pTexture == NULL);
@@ -1797 +1873 @@
     }
     else if (   pSurface->formatD3D == D3DFMT_D24S8
-             || pSurface->formatD3D == D3DFMT_D24X8)
+             || pSurface->formatD3D == D3DFMT_D24X8
+             || pSurface->formatD3D == D3DFMT_D32
+             || pSurface->formatD3D == D3DFMT_D16)
     {
         Assert(pSurface->cFaces == 1);
@@ -3899 +3977 @@
                 &&  pRenderTarget->multiSampleTypeD3D == D3DMULTISAMPLE_NONE
                 &&  (   pRenderTarget->formatD3D == D3DFMT_D24S8
-                     || pRenderTarget->formatD3D == D3DFMT_D24X8))
+                     || pRenderTarget->formatD3D == D3DFMT_D24X8
+                     || pRenderTarget->formatD3D == D3DFMT_D32
+                     || pRenderTarget->formatD3D == D3DFMT_D16))
             {
                 LogFunc(("Creating stencil surface as texture!\n"));