Changeset 100065 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Jun 4, 2023 10:31:42 AM (22 months ago)

Author:

vboxsync

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

157745

Message:

WDDM: read back when mapping for read. bugref:9845

Location:

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

Files:

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

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

@@ -2431 +2431 @@
     }
 
+    /* Readback for read access. */
+    if (DDIMap == D3D10_DDI_MAP_READ || DDIMap == D3D10_DDI_MAP_READWRITE)
+    {
+        vgpu10ReadbackSubResource(pDevice, vboxDXGetAllocation(pResource), Subresource);
+        vboxDXFlush(pDevice, true);
+        /* DXGK now knows that the allocation is in use. So pfnLockCb waits until the data is ready. */
+    }
+
     HRESULT hr;
     D3DDDICB_LOCK ddiLock;
@@ -2444 +2452 @@
         /// @todo ddiLock.Flags.Discard = DDIMap == D3D10_DDI_MAP_WRITE_DISCARD;
         /** @todo Other flags? */
-
-        /** @todo Readback for read access. */
 
         hr = pDevice->pRTCallbacks->pfnLockCb(pDevice->hRTDevice.handle, &ddiLock);

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

@@ -1104 +1104 @@
 
 
+int vgpu10ReadbackSubResource(PVBOXDX_DEVICE pDevice,
+                              D3DKMT_HANDLE hAllocation,
+                              uint32 subResource)
+{
+    void *pvCmd = vboxDXCommandBufferReserve(pDevice, SVGA_3D_CMD_DX_READBACK_SUBRESOURCE,
+                                             sizeof(SVGA3dCmdDXReadbackSubResource), 1);
+    if (!pvCmd)
+        return VERR_NO_MEMORY;
+
+    SVGA3dCmdDXReadbackSubResource *cmd = (SVGA3dCmdDXReadbackSubResource *)pvCmd;
+    cmd->sid = SVGA3D_INVALID_ID;
+    SET_CMD_FIELD(subResource);
+
+    /* fWriteOperation == true should make sure that DXGK waits until the command is completed
+     * before getting the allocation data in pfnLockCb.
+     */
+    vboxDXStorePatchLocation(pDevice, &cmd->sid, VBOXDXALLOCATIONTYPE_SURFACE,
+                             hAllocation, 0, true);
+
+    vboxDXCommandBufferCommit(pDevice);
+    return VINF_SUCCESS;
+}
+
+
 int vgpu10TransferFromBuffer(PVBOXDX_DEVICE pDevice,
                              D3DKMT_HANDLE hSrcAllocation,

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

@@ -239 +239 @@
                             uint32 subResource,
                             const SVGA3dBox *pBox);
+int vgpu10ReadbackSubResource(PVBOXDX_DEVICE pDevice,
+                            D3DKMT_HANDLE hAllocation,
+                            uint32 subResource);
 int vgpu10TransferFromBuffer(PVBOXDX_DEVICE pDevice,
                              D3DKMT_HANDLE hSrcAllocation,

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

@@ -103 +103 @@
     {
         /* The host does not support DX. */
-        return E_FAIL;
+        AssertFailedReturn(E_FAIL);
     }
 
@@ -3787 +3787 @@
     PVBOXDX_RESOURCE pSrcResource = (PVBOXDX_RESOURCE)pPresentArg->hSurfaceToPresent;
     PVBOXDX_RESOURCE pDstResource = (PVBOXDX_RESOURCE)pPresentArg->hDstResource;
-    LogFlowFunc(("pDevice 0x%p, pSrcResource 0x%p[d], pDstResource 0x%p[d], pDXGIContext %p, Flags 0x%08X, FlipInterval %d",
+    LogFlowFunc(("pDevice 0x%p, pSrcResource 0x%p[%d], pDstResource 0x%p[%d], pDXGIContext %p, Flags 0x%08X, FlipInterval %d",
                  pDevice, pSrcResource, pPresentArg->SrcSubResourceIndex,
                  pDstResource, pPresentArg->DstSubResourceIndex, pPresentArg->pDXGIContext,
@@ -3808 +3808 @@
 }
 
-HRESULT APIENTRY vboxDXGIGetGammaCaps(DXGI_DDI_ARG_GET_GAMMA_CONTROL_CAPS *)
-{
-    DEBUG_BREAKPOINT_TEST();
-    LogFlowFuncEnter();
+static HRESULT APIENTRY dxgiGetGammaCaps(DXGI_DDI_ARG_GET_GAMMA_CONTROL_CAPS *pGammaArg)
+{
+    //DEBUG_BREAKPOINT_TEST();
+    PVBOXDX_DEVICE pDevice = (PVBOXDX_DEVICE)pGammaArg->hDevice;
+    LogFlowFunc(("pDevice 0x%p\n", pDevice));
+    RT_NOREF(pDevice);
+
+    pGammaArg->pGammaCapabilities->ScaleAndOffsetSupported = FALSE;
+    pGammaArg->pGammaCapabilities->MaxConvertedValue = 0.0f;
+    pGammaArg->pGammaCapabilities->MinConvertedValue = 0.0f;
+    pGammaArg->pGammaCapabilities->NumGammaControlPoints = 0;
+    RT_ZERO(pGammaArg->pGammaCapabilities->ControlPointPositions);
+
     return S_OK;
 }
@@ -4659 +4668 @@
         DXGI1_2_DDI_BASE_FUNCTIONS *pDXGIFuncs = pCreateData->DXGIBaseDDI.pDXGIDDIBaseFunctions3;
         pDXGIFuncs->pfnPresent = dxgiPresent;
-        pDXGIFuncs->pfnGetGammaCaps = vboxDXGIGetGammaCaps;
+        pDXGIFuncs->pfnGetGammaCaps = dxgiGetGammaCaps;
         pDXGIFuncs->pfnSetDisplayMode = dxgiSetDisplayMode;
         pDXGIFuncs->pfnSetResourcePriority = vboxDXGISetResourcePriority;
@@ -4679 +4688 @@
         DXGI1_1_DDI_BASE_FUNCTIONS *pDXGIFuncs = pCreateData->DXGIBaseDDI.pDXGIDDIBaseFunctions2;
         pDXGIFuncs->pfnPresent = dxgiPresent;
-        pDXGIFuncs->pfnGetGammaCaps = vboxDXGIGetGammaCaps;
+        pDXGIFuncs->pfnGetGammaCaps = dxgiGetGammaCaps;
         pDXGIFuncs->pfnSetDisplayMode = dxgiSetDisplayMode;
         pDXGIFuncs->pfnSetResourcePriority = vboxDXGISetResourcePriority;
@@ -4691 +4700 @@
         DXGI_DDI_BASE_FUNCTIONS *pDXGIFuncs = pCreateData->DXGIBaseDDI.pDXGIDDIBaseFunctions;
         pDXGIFuncs->pfnPresent = dxgiPresent;
-        pDXGIFuncs->pfnGetGammaCaps = vboxDXGIGetGammaCaps;
+        pDXGIFuncs->pfnGetGammaCaps = dxgiGetGammaCaps;
         pDXGIFuncs->pfnSetDisplayMode = dxgiSetDisplayMode;
         pDXGIFuncs->pfnSetResourcePriority = vboxDXGISetResourcePriority;