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

Timestamp:

Jan 10, 2024 8:16:30 AM (13 months ago)

Author:

vboxsync

Message:

Devices/Graphics: multisampling.

File:

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

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

@@ -106 +106 @@
     IDXGIFactory               *pDxgiFactory;          /* DXGI Factory. */
     D3D_FEATURE_LEVEL           FeatureLevel;
+
+    uint32_t                    MultisampleCountMask;  /* 1 << (MSCount - 1) for MSCount = 2, 4, 8, 16, 32 */
 
     ID3D11VideoDevice          *pVideoDevice;
@@ -909 +911 @@
                 *pu32DevCap |= SVGA3D_DXFMT_DX_VERTEX_BUFFER;
 
-            UINT NumQualityLevels;
-            hr = pDevice->CheckMultisampleQualityLevels(dxgiFormat, 2, &NumQualityLevels);
-            if (SUCCEEDED(hr) && NumQualityLevels != 0)
-                *pu32DevCap |= SVGA3D_DXFMT_MULTISAMPLE;
+            if (pState->pBackend->dxDevice.MultisampleCountMask != 0)
+            {
+                UINT NumQualityLevels;
+                hr = pDevice->CheckMultisampleQualityLevels(dxgiFormat, 2, &NumQualityLevels);
+                if (SUCCEEDED(hr) && NumQualityLevels != 0)
+                    *pu32DevCap |= SVGA3D_DXFMT_MULTISAMPLE;
+            }
         }
         else
@@ -1357 +1362 @@
         rc = VERR_NOT_SUPPORTED;
 
+    if (SUCCEEDED(hr))
+    {
+        /* Query multisample support for a common format. */
+        DXGI_FORMAT const dxgiFormat = DXGI_FORMAT_B8G8R8A8_UNORM;
+
+        for (uint32_t i = 2; i <= D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT; i *= 2)
+        {
+            UINT NumQualityLevels = 0;
+            HRESULT hr2 = pDXDevice->pDevice->CheckMultisampleQualityLevels(dxgiFormat, i, &NumQualityLevels);
+            if (SUCCEEDED(hr2) && NumQualityLevels > 0)
+                pDXDevice->MultisampleCountMask |= UINT32_C(1) << (i - 1);
+        }
+    }
     return rc;
 }
@@ -2026 +2044 @@
             if (pSurface->surfaceDesc.numArrayElements <= 1)
             {
-                desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D;
+                desc.ViewDimension = pSurface->surfaceDesc.multisampleCount > 1
+                                   ? D3D11_RTV_DIMENSION_TEXTURE2DMS
+                                   : D3D11_RTV_DIMENSION_TEXTURE2D;
                 desc.Texture2D.MipSlice = pEntry->desc.tex.mipSlice;
             }
             else
             {
-                desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DARRAY;
+                desc.ViewDimension = pSurface->surfaceDesc.multisampleCount > 1
+                                   ? D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY
+                                   : D3D11_RTV_DIMENSION_TEXTURE2DARRAY;
                 desc.Texture2DArray.MipSlice = pEntry->desc.tex.mipSlice;
                 desc.Texture2DArray.FirstArraySlice = pEntry->desc.tex.firstArraySlice;
@@ -2102 +2124 @@
             if (pSurface->surfaceDesc.numArrayElements <= 1)
             {
-                desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
+                desc.ViewDimension = pSurface->surfaceDesc.multisampleCount > 1
+                                   ? D3D11_SRV_DIMENSION_TEXTURE2DMS
+                                   : D3D11_SRV_DIMENSION_TEXTURE2D;
                 desc.Texture2D.MostDetailedMip = pEntry->desc.tex.mostDetailedMip;
                 desc.Texture2D.MipLevels = pEntry->desc.tex.mipLevels;
@@ -2108 +2132 @@
             else
             {
-                desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DARRAY;
+                desc.ViewDimension = pSurface->surfaceDesc.multisampleCount > 1
+                                   ? D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY
+                                   : D3D11_SRV_DIMENSION_TEXTURE2DARRAY;
                 desc.Texture2DArray.MostDetailedMip = pEntry->desc.tex.mostDetailedMip;
                 desc.Texture2DArray.MipLevels = pEntry->desc.tex.mipLevels;
@@ -2245 +2271 @@
             if (pSurface->surfaceDesc.numArrayElements <= 1)
             {
-                desc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D;
+                desc.ViewDimension = pSurface->surfaceDesc.multisampleCount > 1
+                                   ? D3D11_DSV_DIMENSION_TEXTURE2DMS
+                                   : D3D11_DSV_DIMENSION_TEXTURE2D;
                 desc.Texture2D.MipSlice = pEntry->mipSlice;
             }
             else
             {
-                desc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DARRAY;
+                desc.ViewDimension = pSurface->surfaceDesc.multisampleCount > 1
+                                   ? D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY
+                                   : D3D11_DSV_DIMENSION_TEXTURE2DARRAY;
                 desc.Texture2DArray.MipSlice = pEntry->mipSlice;
                 desc.Texture2DArray.FirstArraySlice = pEntry->firstArraySlice;
@@ -2702 +2732 @@
      */
     D3D11_SUBRESOURCE_DATA *paInitialData = NULL;
-    if (pSurface->paMipmapLevels[0].pSurfaceData)
+    if (pSurface->paMipmapLevels[0].pSurfaceData && pSurface->surfaceDesc.multisampleCount <= 1)
     {
         /* Can happen for a non GBO surface or if GBO texture was updated prior to creation of the hardware resource. */
@@ -2912 +2942 @@
             td.ArraySize          = pSurface->surfaceDesc.numArrayElements;
             td.Format             = dxgiFormat;
-            td.SampleDesc.Count   = 1;
+            td.SampleDesc.Count   = pSurface->surfaceDesc.multisampleCount;
             td.SampleDesc.Quality = 0;
             td.Usage              = D3D11_USAGE_DEFAULT;
@@ -2930 +2960 @@
                 td.MipLevels      = 1; /* Must be for D3D11_USAGE_DYNAMIC. */
                 td.ArraySize      = 1; /* Must be for D3D11_USAGE_DYNAMIC. */
+                td.SampleDesc.Count   = 1;
+                td.SampleDesc.Quality = 0;
                 td.Usage          = D3D11_USAGE_DYNAMIC;
                 td.BindFlags      = D3D11_BIND_SHADER_RESOURCE; /* Have to specify a supported flag, otherwise E_INVALIDARG will be returned. */
@@ -3483 +3515 @@
     LogRelMax(1, ("VMSVGA: Single DX device mode: %s\n", pBackend->fSingleDevice ? "enabled" : "disabled"));
 
-    vmsvga3dDXInitContextMobData(&pBackend->svgaDXContext); /** @todo */
+    vmsvga3dDXInitContextMobData(&pBackend->svgaDXContext);
 //DEBUG_BREAKPOINT_TEST();
     return rc;
@@ -3524 +3556 @@
         if (pBackend->dxDevice.pVideoDevice)
             dxLogRelVideoCaps(pBackend->dxDevice.pVideoDevice);
+
+        if (!pThis->svga.fVMSVGA3dMSAA)
+            pBackend->dxDevice.MultisampleCountMask = 0;
     }
     return rc;
@@ -4769 +4804 @@
 
     case SVGA3D_DEVCAP_MULTISAMPLE_2X:
-        *pu32Val = 0; /* boolean */
+        *pu32Val = RT_BOOL(pState->pBackend->dxDevice.MultisampleCountMask & (1 << (2 - 1))); /* boolean */
         break;
 
     case SVGA3D_DEVCAP_MULTISAMPLE_4X:
-        *pu32Val = 0; /* boolean */
+        *pu32Val = RT_BOOL(pState->pBackend->dxDevice.MultisampleCountMask & (1 << (4 - 1))); /* boolean */
         break;
 
@@ -4800 +4835 @@
 
     case SVGA3D_DEVCAP_MULTISAMPLE_8X:
-        *pu32Val = 0; /* boolean */
+        *pu32Val = RT_BOOL(pState->pBackend->dxDevice.MultisampleCountMask & (1 << (8 - 1))); /* boolean */
         break;
 
@@ -7131 +7166 @@
                                 case SVGA3D_RESOURCE_TEXTURE2D:
                                     if (pSurface->surfaceDesc.numArrayElements <= 1)
-                                        aResourceDimension[idxSR] = VGPU10_RESOURCE_DIMENSION_TEXTURE2D;
+                                        aResourceDimension[idxSR] = pSurface->surfaceDesc.multisampleCount > 1
+                                                                  ? VGPU10_RESOURCE_DIMENSION_TEXTURE2DMS
+                                                                  : VGPU10_RESOURCE_DIMENSION_TEXTURE2D;
                                     else
-                                        aResourceDimension[idxSR] = VGPU10_RESOURCE_DIMENSION_TEXTURE2DARRAY;
+                                        aResourceDimension[idxSR] = pSurface->surfaceDesc.multisampleCount > 1
+                                                                  ? VGPU10_RESOURCE_DIMENSION_TEXTURE2DMSARRAY
+                                                                  : VGPU10_RESOURCE_DIMENSION_TEXTURE2DARRAY;
                                     break;
                                 case SVGA3D_RESOURCE_TEXTURE3D:
@@ -8769 +8808 @@
     }
 
+#ifdef DEBUG_sunlover
+    if (pSrcSurface->surfaceDesc.multisampleCount > 1 || pDstSurface->surfaceDesc.multisampleCount > 1)
+        DEBUG_BREAKPOINT_TEST();
+#endif
+
     LogFunc(("cid %d: src cid %d%s -> dst cid %d%s\n",
              pDXContext->cid, pSrcSurface->idAssociatedContext,
@@ -9858 +9902 @@
 
 
-static DECLCALLBACK(int) vmsvga3dBackDXResolveCopy(PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext)
-{
-    PVMSVGA3DBACKEND pBackend = pThisCC->svga.p3dState->pBackend;
-
-    RT_NOREF(pBackend, pDXContext);
-    AssertFailed(); /** @todo Implement */
-    return VERR_NOT_IMPLEMENTED;
+static DECLCALLBACK(int) vmsvga3dBackDXResolveCopy(PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext,
+                                                   SVGA3dSurfaceId dstSid, uint32_t dstSubResource,
+                                                   SVGA3dSurfaceId srcSid, uint32_t srcSubResource, SVGA3dSurfaceFormat copyFormat)
+{
+    DXDEVICE *pDXDevice = dxDeviceFromContext(pThisCC->svga.p3dState, pDXContext);
+    AssertReturn(pDXDevice->pDevice, VERR_INVALID_STATE);
+
+    PVMSVGA3DSURFACE pSrcSurface;
+    ID3D11Resource *pSrcResource;
+    int rc = dxEnsureResource(pThisCC, pDXContext, srcSid, &pSrcSurface, &pSrcResource);
+    AssertRCReturn(rc, rc);
+
+    PVMSVGA3DSURFACE pDstSurface;
+    ID3D11Resource *pDstResource;
+    rc = dxEnsureResource(pThisCC, pDXContext, dstSid, &pDstSurface, &pDstResource);
+    AssertRCReturn(rc, rc);
+
+    LogFunc(("cid %d: src sid = %u -> dst sid = %u\n", pDXContext->cid, srcSid, dstSid));
+
+    DXGI_FORMAT const dxgiFormat = vmsvgaDXSurfaceFormat2Dxgi(copyFormat);
+    pDXDevice->pImmediateContext->ResolveSubresource(pDstResource, dstSubResource, pSrcResource, srcSubResource, dxgiFormat);
+
+    pDstSurface->pBackendSurface->cidDrawing = pDXContext->cid;
+    return VINF_SUCCESS;
 }