Changeset 81904 in vbox for trunk/src/VBox/Additions

Timestamp:

Nov 17, 2019 2:39:45 PM (5 years ago)

Author:

vboxsync

Message:

WDDM: SetRenderTarget resets the viewport and the scissor rectangle, restore them

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm

Files:

• VBoxDispD3D.h (modified) (1 diff)
• gallium/GaDdi.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.h

@@ -167 +167 @@
     VBOXWDDMDISP_STREAM_SOURCE_INFO StreamSourceInfo[VBOXWDDMDISP_MAX_VERTEX_STREAMS];
     VBOXWDDMDISP_INDICES_INFO IndiciesInfo;
-    /* need to cache the ViewPort data because IDirect3DDevice9::SetViewport
-     * is split into two calls : SetViewport & SetZRange */
+    /* Need to cache the ViewPort data because IDirect3DDevice9::SetViewport
+     * is split into two calls: SetViewport & SetZRange.
+     * Also the viewport must be restored after IDirect3DDevice9::SetRenderTarget.
+     */
     D3DVIEWPORT9 ViewPort;
+    /* The scissor rectangle must be restored after IDirect3DDevice9::SetRenderTarget. */
+    RECT ScissorRect;
+    /* Whether the ViewPort field is valid, i.e. GaDdiSetViewport has been called. */
+    bool fViewPort : 1;
+    /* Whether the ScissorRect field is valid, i.e. GaDdiSetScissorRect has been called. */
+    bool fScissorRect : 1;
     VBOXWDDMDISP_CONTEXT DefaultContext;
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/gallium/GaDdi.cpp

@@ -3170 +3170 @@
     pDevice->ViewPort.Width  = pData->Width;
     pDevice->ViewPort.Height = pData->Height;
+    pDevice->fViewPort = true;
 
     HRESULT hr = pDevice9If->SetViewport(&pDevice->ViewPort);
@@ -3189 +3190 @@
     pDevice->ViewPort.MinZ = pData->MinZ;
     pDevice->ViewPort.MaxZ = pData->MaxZ;
+    pDevice->fViewPort = true;
 
     HRESULT hr = pDevice9If->SetViewport(&pDevice->ViewPort);
@@ -3457 +3459 @@
     IDirect3DDevice9 *pDevice9If = VBOXDISP_D3DEV(pDevice);
 
+    pDevice->ScissorRect = *pRect;
+    pDevice->fScissorRect = true;
+
     HRESULT hr = pDevice9If->SetScissorRect(pRect);
     Assert(hr == S_OK);
@@ -3833 +3838 @@
     {
         pDevice->apRTs[pData->RenderTargetIndex] = pAlloc;
+
+        /* IDirect3DDevice9::SetRenderTarget method resets the viewport and the scissor rectangle. */
+        if (pDevice->fViewPort)
+        {
+            pDevice9If->SetViewport(&pDevice->ViewPort);
+        }
+        if (pDevice->fScissorRect)
+        {
+            pDevice9If->SetScissorRect(&pDevice->ScissorRect);
+        }
     }
 
@@ -4583 +4598 @@
         pDevice->ViewPort.MinZ   = 0.;
         pDevice->ViewPort.MaxZ   = 1.;
+        pDevice->fViewPort = false;
+        pDevice->fScissorRect = false;
 
         /*