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

Timestamp:

May 16, 2022 3:17:36 PM (3 years ago)

Author:

vboxsync

Message:

Devices/Graphics: shaders; render targets; removed a wrong ClearState call: bugref:9830

File:

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

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

@@ -947 +947 @@
     RT_NOREF(pBackend);
 
-    if (pDevice->pImmediateContext)
-    {
-        dxDeviceFlush(pDevice); /* Make sure that any pending draw calls are finished. */
-        pDevice->pImmediateContext->ClearState();
-    }
-
     D3D_RELEASE(pDevice->pStagingBuffer);
 
@@ -5002 +4996 @@
         VMSVGA3DBACKENDDXCONTEXT *pBackendDXContext = pDXContext->pBackendDXContext;
 
+        if (pBackendDXContext->dxDevice.pImmediateContext)
+            dxDeviceFlush(&pBackendDXContext->dxDevice); /* Make sure that any pending draw calls are finished. */
+
         if (pBackendDXContext->paRenderTargetView)
         {
@@ -5386 +5383 @@
 
     /* Make sure that the shader resource views exist. */
-    for (uint32_t idxShaderState = 0; idxShaderState < SVGA3D_NUM_SHADERTYPE_DX10 /** @todo SVGA3D_NUM_SHADERTYPE*/; ++idxShaderState)
+    for (uint32_t idxShaderState = 0; idxShaderState < SVGA3D_NUM_SHADERTYPE; ++idxShaderState)
     {
         for (uint32_t idxSR = 0; idxSR < SVGA3D_DX_MAX_SRVIEWS; ++idxSR)
@@ -5593 +5590 @@
      */
 
-    for (uint32_t idxShaderState = 0; idxShaderState < SVGA3D_NUM_SHADERTYPE_DX10 /** @todo SVGA3D_NUM_SHADERTYPE*/; ++idxShaderState)
+    for (uint32_t idxShaderState = 0; idxShaderState < SVGA3D_NUM_SHADERTYPE; ++idxShaderState)
     {
         DXSHADER *pDXShader;
@@ -5605 +5602 @@
             {
                 /* Create a new shader. */
-                Log(("Shader: cid=%u shid=%u type=%d\n", pDXContext->cid, shaderId, pDXShader->enmShaderType));
+                Log(("Shader: cid=%u shid=%u type=%d, GuestSignatures %d\n", pDXContext->cid, shaderId, pDXShader->enmShaderType, pDXShader->shaderInfo.fGuestSignatures));
 
                 /* Apply resource types to a pixel shader. */
@@ -6280 +6277 @@
     }
 
+    UINT NumRTVs = 0;
     ID3D11RenderTargetView *apRenderTargetViews[SVGA3D_MAX_RENDER_TARGETS];
     RT_ZERO(apRenderTargetViews);
@@ -6289 +6287 @@
             ASSERT_GUEST_RETURN(renderTargetViewId < pDXContext->pBackendDXContext->cRenderTargetView, VERR_INVALID_PARAMETER);
             apRenderTargetViews[i] = pDXContext->pBackendDXContext->paRenderTargetView[renderTargetViewId].u.pRenderTargetView;
+            ++NumRTVs;
         }
     }
@@ -6297 +6296 @@
         pDepthStencilView = pDXContext->pBackendDXContext->paDepthStencilView[depthStencilViewId].u.pDepthStencilView;
 
-    pDevice->pImmediateContext->OMSetRenderTargets(pDXContext->cRenderTargets,
+    pDevice->pImmediateContext->OMSetRenderTargetsAndUnorderedAccessViews(NumRTVs,
                                                    apRenderTargetViews,
-                                                   pDepthStencilView);
-//    Assert(NumUAVs == 0);
-    if (NumUAVs != 0)
-        pDevice->pImmediateContext->OMSetRenderTargetsAndUnorderedAccessViews(D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL,
-                                                       NULL,
-                                                       NULL,
-                                                       pDXContext->svgaDXContext.uavSpliceIndex,
-                                                       NumUAVs,
-                                                       apUnorderedAccessViews,
-                                                       aUAVInitialCounts);
+                                                   pDepthStencilView,
+                                                   NumRTVs /*pDXContext->svgaDXContext.uavSpliceIndex*/,
+                                                   NumUAVs,
+                                                   apUnorderedAccessViews,
+                                                   aUAVInitialCounts);
     return VINF_SUCCESS;
 }