Changeset 82583 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp

Timestamp:

Dec 13, 2019 9:29:51 PM (5 years ago)

Author:

vboxsync

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

135463

Message:

Devices/Graphics: fixes for the CLEAR command; BLIT_SURFACE_TO_SCREEN must ignore the face and mipmap parameters.

File:

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

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

@@ -3904 +3904 @@
     /* Save for vm state save/restore. */
     pContext->state.aRenderTargets[type] = target.sid;
+    /** @todo Also save target.face and target.mipmap */
 
     if (target.sid == SVGA3D_INVALID_ID)
@@ -4800 +4801 @@
                          uint32_t stencil, uint32_t cRects, SVGA3dRect *pRect)
 {
+    /* From SVGA3D_BeginClear comments:
+     *
+     *      Clear is not affected by clipping, depth test, or other
+     *      render state which affects the fragment pipeline.
+     *
+     * Therefore this code must ignore the current scissor rect.
+     */
+
     DWORD                 clearFlagD3D = 0;
     D3DRECT              *pRectD3D = NULL;
@@ -4812 +4821 @@
     AssertRCReturn(rc, rc);
 
+    PVMSVGA3DSURFACE pRT;
+    rc = vmsvga3dSurfaceFromSid(pState, pContext->state.aRenderTargets[SVGA3D_RT_COLOR0], &pRT);
+    AssertRCReturn(rc, rc);
+
     if (clearFlag & SVGA3D_CLEAR_COLOR)
         clearFlagD3D |= D3DCLEAR_TARGET;
@@ -4834 +4847 @@
     }
 
+    RECT currentScissorRect;
+    pContext->pDevice->GetScissorRect(&currentScissorRect);
+
+    RECT clearScissorRect;
+    clearScissorRect.left   = 0;
+    clearScissorRect.top    = 0;
+    clearScissorRect.right  = pRT->paMipmapLevels[0].mipmapSize.width;
+    clearScissorRect.bottom = pRT->paMipmapLevels[0].mipmapSize.height;
+    pContext->pDevice->SetScissorRect(&clearScissorRect);
+
     hr = pContext->pDevice->Clear(cRects, pRectD3D, clearFlagD3D, (D3DCOLOR)color, depth, stencil);
+
     if (pRectD3D)
         RTMemFree(pRectD3D);
+
+    pContext->pDevice->SetScissorRect(&currentScissorRect);
 
     AssertMsgReturn(hr == D3D_OK, ("Clear failed with %x\n", hr), VERR_INTERNAL_ERROR);