Changeset 95035 in vbox

Timestamp:

May 18, 2022 10:30:19 AM (3 years ago)

Author:

vboxsync

Message:

Devices/Graphics: unordered access views: bugref:9830

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-dx.cpp (modified) (2 diffs)
• DevVGA-SVGA3d-win-dx.cpp (modified) (3 diffs)

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

@@ -2923 +2923 @@
     AssertRCReturn(rc, rc);
 
-    ASSERT_GUEST_RETURN(pCmd->uavSpliceIndex < SVGA3D_DX11_1_MAX_UAVIEWS, VERR_INVALID_PARAMETER);
-    ASSERT_GUEST_RETURN(cUAViewId <= SVGA3D_DX11_1_MAX_UAVIEWS - pCmd->uavSpliceIndex, VERR_INVALID_PARAMETER);
+    ASSERT_GUEST_RETURN(pCmd->uavSpliceIndex <= SVGA3D_MAX_SIMULTANEOUS_RENDER_TARGETS, VERR_INVALID_PARAMETER);
+    ASSERT_GUEST_RETURN(cUAViewId <= SVGA3D_DX11_1_MAX_UAVIEWS, VERR_INVALID_PARAMETER);
     for (uint32_t i = 0; i < cUAViewId; ++i)
         ASSERT_GUEST_RETURN(   paUAViewId[i] < pDXContext->cot.cUAView
@@ -2933 +2933 @@
     {
         SVGA3dUAViewId const uaViewId = paUAViewId[i];
-        pDXContext->svgaDXContext.uaViewIds[pCmd->uavSpliceIndex + i] = uaViewId;
+        pDXContext->svgaDXContext.uaViewIds[i] = uaViewId;
     }
     pDXContext->svgaDXContext.uavSpliceIndex = pCmd->uavSpliceIndex;

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

@@ -5560 +5560 @@
     /* Unbind render target views because they mught be (re-)used as shader resource views. */
     DXDEVICE *pDXDevice = dxDeviceFromContext(pThisCC->svga.p3dState, pDXContext);
-    pDXDevice->pImmediateContext->OMSetRenderTargets(0, NULL, NULL);
+    pDXDevice->pImmediateContext->OMSetRenderTargetsAndUnorderedAccessViews(0, NULL, NULL, 0, 0, NULL, NULL);
 
     /*
@@ -6475 +6475 @@
     }
 
+    /* RTVs are followed by UAVs. */
+    Assert(NumRTVs <= pDXContext->svgaDXContext.uavSpliceIndex);
+
     ID3D11DepthStencilView *pDepthStencilView = NULL;
     SVGA3dDepthStencilViewId const depthStencilViewId = pDXContext->svgaDXContext.renderState.depthStencilViewId;
@@ -6483 +6486 @@
                                                    apRenderTargetViews,
                                                    pDepthStencilView,
-                                                   NumRTVs /*pDXContext->svgaDXContext.uavSpliceIndex*/,
+                                                   pDXContext->svgaDXContext.uavSpliceIndex,
                                                    NumUAVs,
                                                    apUnorderedAccessViews,