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

Timestamp:

Nov 30, 2023 9:59:50 PM (14 months ago)

Author:

vboxsync

Message:

WDDM: user mode driver update: bugref:10529

Location:

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

Files:

• VBoxDX.cpp (modified) (1 diff)
• VBoxDX.h (modified) (1 diff)
• VBoxDXCmd.cpp (modified) (1 diff)
• VBoxDXCmd.h (modified) (1 diff)
• VBoxDXDDI.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/dx/VBoxDX.cpp

@@ -3462 +3462 @@
 
 
+void vboxDXClearView(PVBOXDX_DEVICE pDevice, D3D11DDI_HANDLETYPE ViewType, uint32_t ViewId, FLOAT const Color[4], D3D10_DDI_RECT const *pRect, UINT NumRects)
+{
+    SVGAFifo3dCmdId enmCmdId = VBSVGA_3D_CMD_DX_CLEAR_RTV;
+    switch (ViewType)
+    {
+        case D3D10DDI_HT_RENDERTARGETVIEW:
+            break;
+        case D3D11DDI_HT_UNORDEREDACCESSVIEW:
+            enmCmdId = VBSVGA_3D_CMD_DX_CLEAR_UAV;
+            break;
+        case D3D11_1DDI_HT_VIDEODECODEROUTPUTVIEW:
+            enmCmdId = VBSVGA_3D_CMD_DX_CLEAR_VDOV;
+            break;
+        case D3D11_1DDI_HT_VIDEOPROCESSORINPUTVIEW:
+            enmCmdId = VBSVGA_3D_CMD_DX_CLEAR_VPIV;
+            break;
+        case D3D11_1DDI_HT_VIDEOPROCESSOROUTPUTVIEW:
+            enmCmdId = VBSVGA_3D_CMD_DX_CLEAR_VPOV;
+            break;
+        default:
+            AssertFailedReturnVoid();
+    }
+
+    vgpu10ClearView(pDevice, enmCmdId, ViewId, Color, pRect, NumRects);
+}
+
+
 static void dxDeallocateStagingResources(PVBOXDX_DEVICE pDevice)
 {

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

@@ -735 +735 @@
 void vboxDXDrawInstancedIndirect(PVBOXDX_DEVICE pDevice, PVBOXDX_RESOURCE pResource, UINT AlignedByteOffsetForArgs);
 void vboxDXCopyStructureCount(PVBOXDX_DEVICE pDevice, PVBOXDX_RESOURCE pDstBuffer, UINT DstAlignedByteOffset, PVBOXDXUNORDEREDACCESSVIEW pSrcView);
+void vboxDXClearView(PVBOXDX_DEVICE pDevice, D3D11DDI_HANDLETYPE ViewType, uint32_t ViewId, FLOAT const Color[4], D3D10_DDI_RECT const *pRect, UINT NumRects);
 HRESULT vboxDXBlt(PVBOXDX_DEVICE pDevice, PVBOXDX_RESOURCE pDstResource, UINT DstSubresource,
                   PVBOXDX_RESOURCE pSrcResource, UINT SrcSubresource,

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/dx/VBoxDXCmd.cpp

@@ -921 +921 @@
 }
 
+
+int vgpu10ClearView(PVBOXDX_DEVICE pDevice,
+                    SVGAFifo3dCmdId cmdId,
+                    uint32_t viewId,
+                    const float color[4],
+                    const D3D10_DDI_RECT *paRects,
+                    uint32_t cRects)
+{
+    void *pvCmd = vboxDXCommandBufferReserve(pDevice, cmdId,
+                                             sizeof(VBSVGA3dCmdDXClearView) + cRects * sizeof(SVGASignedRect));
+    if (!pvCmd)
+        return VERR_NO_MEMORY;
+
+    VBSVGA3dCmdDXClearView *cmd = (VBSVGA3dCmdDXClearView *)pvCmd;
+    SET_CMD_FIELD(viewId);
+    cmd->color.value[0] = color[0];
+    cmd->color.value[1] = color[1];
+    cmd->color.value[2] = color[2];
+    cmd->color.value[3] = color[3];
+
+    SVGASignedRect *paSvgaRects = (SVGASignedRect *)&cmd[1];
+    for (uint32_t i = 0; i < cRects; ++i)
+    {
+        SVGASignedRect *d = &paSvgaRects[i];
+        const D3D10_DDI_RECT *s = &paRects[i];
+        d->left   = s->left;
+        d->top    = s->top;
+        d->right  = s->right;
+        d->bottom = s->bottom;
+    }
+
+    vboxDXCommandBufferCommit(pDevice);
+    return VINF_SUCCESS;
+}
+
+
 int vgpu10DestroyRenderTargetView(PVBOXDX_DEVICE pDevice,
                                   SVGA3dRenderTargetViewId renderTargetViewId)

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

@@ -471 +471 @@
                              uint32 sizeInBytes,
                              uint64 fenceValue);
+int vgpu10ClearView(PVBOXDX_DEVICE pDevice,
+                    SVGAFifo3dCmdId cmdId,
+                    uint32_t viewId,
+                    const float color[4],
+                    const D3D10_DDI_RECT *paRects,
+                    uint32_t cRects);
 
 #endif /* !GA_INCLUDED_SRC_WINNT_Graphics_Video_disp_wddm_dx_VBoxDXCmd_h */

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/dx/VBoxDXDDI.cpp

@@ -3705 +3705 @@
     PVBOXDX_DEVICE pDevice = (PVBOXDX_DEVICE)hDevice.pDrvPrivate;
     LogFlowFunc(("pDevice 0x%p, ViewType %d, pView %p, pRect %p, NumRects %u", pDevice, ViewType, hView, pRect, NumRects));
+
+    if (pDevice->pAdapter->fVBoxCaps & VBSVGA3D_CAP_VIDEO)
+    {
+        uint32_t ViewId = SVGA3D_INVALID_ID;
+
+        /* "Possible types are the following.
+         * D3D10DDI_HT_RENDERTARGETVIEW
+         * D3D11DDI_HT_UNORDEREDACCESSVIEW
+         * Any D3D11_1DDI_HT_VIDEOXXX type"
+         */
+        switch (ViewType)
+        {
+            case D3D10DDI_HT_RENDERTARGETVIEW:
+            {
+                PVBOXDXRENDERTARGETVIEW pRenderTargetView = (PVBOXDXRENDERTARGETVIEW)hView;
+                ViewId = pRenderTargetView->uRenderTargetViewId;
+                break;
+            }
+            case D3D11DDI_HT_UNORDEREDACCESSVIEW:
+            {
+                PVBOXDXUNORDEREDACCESSVIEW pUnorderedAccessView = (PVBOXDXUNORDEREDACCESSVIEW)hView;
+                ViewId = pUnorderedAccessView->uUnorderedAccessViewId;
+                break;
+            }
+            case D3D11_1DDI_HT_VIDEODECODEROUTPUTVIEW:
+            {
+                PVBOXDXVIDEODECODEROUTPUTVIEW pVideoDecoderOutputView = (PVBOXDXVIDEODECODEROUTPUTVIEW)hView;
+                ViewId = pVideoDecoderOutputView->uVideoDecoderOutputViewId;
+                break;
+            }
+            case D3D11_1DDI_HT_VIDEOPROCESSORINPUTVIEW:
+            {
+                PVBOXDXVIDEOPROCESSORINPUTVIEW pVideoProcessorInputView = (PVBOXDXVIDEOPROCESSORINPUTVIEW)hView;
+                ViewId = pVideoProcessorInputView->uVideoProcessorInputViewId;
+                break;
+            }
+            case D3D11_1DDI_HT_VIDEOPROCESSOROUTPUTVIEW:
+            {
+                PVBOXDXVIDEOPROCESSOROUTPUTVIEW pVideoProcessorOutputView = (PVBOXDXVIDEOPROCESSOROUTPUTVIEW)hView;
+                ViewId = pVideoProcessorOutputView->uVideoProcessorOutputViewId;
+                break;
+            }
+            default:
+            {
+                DEBUG_BREAKPOINT_TEST();
+                break;
+            }
+        }
+        if (ViewId != SVGA3D_INVALID_ID)
+            vboxDXClearView(pDevice, ViewType, ViewId, Color, pRect, NumRects);
+        return;
+    }
+
     if (ViewType == D3D10DDI_HT_RENDERTARGETVIEW)
     {