Changeset 98052 in vbox for trunk/src/VBox/Devices

Timestamp:

Jan 11, 2023 5:57:27 AM (2 years ago)

Author:

vboxsync

Message:

Devices/Graphics: allow to use different formats for staging and dynamic resources; logging. bugref:9830

File:

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

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

@@ -2442 +2442 @@
         dxgiFormat = dxgiFormatTypeless;
 
+    /* Format for staging resource is always the typeless one. */
+    DXGI_FORMAT const dxgiFormatStaging = dxgiFormatTypeless;
+
+    DXGI_FORMAT dxgiFormatDynamic;
+    /* Some drivers do not allow to use depth typeless formats for dynamic resources.
+     * Create a placeholder texture (it does not work with CopySubresource).
+     */
+    /** @todo Implement upload from such textures. */
+    if (dxgiFormatTypeless == DXGI_FORMAT_R24G8_TYPELESS)
+        dxgiFormatDynamic = DXGI_FORMAT_R32_UINT;
+    else if (dxgiFormatTypeless == DXGI_FORMAT_R32G8X24_TYPELESS)
+        dxgiFormatDynamic = DXGI_FORMAT_R32G32_UINT;
+    else
+        dxgiFormatDynamic = dxgiFormatTypeless;
+
     /*
      * Create D3D11 texture object.
@@ -2489 +2504 @@
         {
             /* Map-able texture. */
-            td.Format         = dxgiFormatTypeless;
+            td.Format         = dxgiFormatDynamic;
             td.Usage          = D3D11_USAGE_DYNAMIC;
             td.BindFlags      = D3D11_BIND_SHADER_RESOURCE; /* Have to specify a supported flag, otherwise E_INVALIDARG will be returned. */
@@ -2501 +2516 @@
         {
             /* Staging texture. */
+            td.Format         = dxgiFormatStaging;
             td.Usage          = D3D11_USAGE_STAGING;
             td.BindFlags      = 0; /* No flags allowed. */
@@ -2545 +2561 @@
         {
             /* Map-able texture. */
-            td.Format         = dxgiFormatTypeless;
+            td.Format         = dxgiFormatDynamic;
             td.MipLevels      = 1; /* Must be for D3D11_USAGE_DYNAMIC. */
             td.ArraySize      = 1; /* Must be for D3D11_USAGE_DYNAMIC. */
@@ -2559 +2575 @@
         {
             /* Staging texture. */
+            td.Format         = dxgiFormatStaging;
             td.Usage          = D3D11_USAGE_STAGING;
             td.BindFlags      = 0; /* No flags allowed. */
@@ -2601 +2618 @@
         {
             /* Map-able texture. */
-            td.Format         = dxgiFormatTypeless;
+            td.Format         = dxgiFormatDynamic;
             td.MipLevels      = 1; /* Must be for D3D11_USAGE_DYNAMIC. */
             td.ArraySize      = 1; /* Must be for D3D11_USAGE_DYNAMIC. */
@@ -2615 +2632 @@
         {
             /* Staging texture. */
+            td.Format         = dxgiFormatStaging;
             td.Usage          = D3D11_USAGE_STAGING;
             td.BindFlags      = 0; /* No flags allowed. */
@@ -2661 +2679 @@
             {
                 /* Map-able texture. */
-                td.Format         = dxgiFormatTypeless;
+                td.Format         = dxgiFormatDynamic;
                 td.MipLevels      = 1; /* Must be for D3D11_USAGE_DYNAMIC. */
                 td.Usage          = D3D11_USAGE_DYNAMIC;
@@ -2674 +2692 @@
             {
                 /* Staging texture. */
+                td.Format         = dxgiFormatStaging;
                 td.Usage          = D3D11_USAGE_STAGING;
                 td.BindFlags      = 0; /* No flags allowed. */
@@ -2720 +2739 @@
             {
                 /* Map-able texture. */
-                td.Format         = dxgiFormatTypeless;
+                td.Format         = dxgiFormatDynamic;
                 td.MipLevels      = 1; /* Must be for D3D11_USAGE_DYNAMIC. */
                 td.ArraySize      = 1; /* Must be for D3D11_USAGE_DYNAMIC. */
@@ -2734 +2753 @@
             {
                 /* Staging texture. */
+                td.Format         = dxgiFormatStaging;
                 td.Usage          = D3D11_USAGE_STAGING;
                 td.BindFlags      = 0; /* No flags allowed. */
@@ -2750 +2770 @@
             }
         }
+    }
+
+    if (hr == DXGI_ERROR_DEVICE_REMOVED)
+    {
+        DEBUG_BREAKPOINT_TEST();
+        hr = pDXDevice->pDevice->GetDeviceRemovedReason();
     }
 
@@ -3775 +3801 @@
     else if (pBackendSurface->enmResType == VMSVGA3D_RESTYPE_BUFFER)
     {
+        Log4(("Unmap buffer sid = %u:\n%.*Rhxd\n", pSurface->id, pMap->cbRow, pMap->pvData));
+
         /* Unmap the staging buffer. */
         UINT const Subresource = 0; /* Buffers have only one subresource. */
@@ -5970 +5998 @@
             || pBufferContext->offset != pBufferPipeline->offset)
         {
-            LogFunc(("vertex buffer: [%u]: sid = %u, %p -> %p\n",
-                     i, pDXContext->svgaDXContext.inputAssembly.vertexBuffers[i].bufferId, pBufferPipeline->pBuffer, pBufferContext->pBuffer));
+            LogFunc(("vertex buffer: [%u]: sid = %u, %p (stride %d, off %d) -> %p (stride %d, off %d)\n",
+                     i, pDXContext->svgaDXContext.inputAssembly.vertexBuffers[i].bufferId,
+                     pBufferPipeline->pBuffer, pBufferPipeline->stride, pBufferPipeline->offset,
+                     pBufferContext->pBuffer, pBufferContext->stride, pBufferContext->offset));
 
             if (pBufferContext->pBuffer != pBufferPipeline->pBuffer)
@@ -5983 +6013 @@
             idxMaxSlot = i;
         }
+#ifdef LOG_ENABLED
+        else if (pBufferContext->pBuffer)
+        {
+            LogFunc(("vertex buffer: [%u]: sid = %u, %p (stride %d, off %d)\n",
+                     i, pDXContext->svgaDXContext.inputAssembly.vertexBuffers[i].bufferId,
+                     pBufferContext->pBuffer, pBufferContext->stride, pBufferContext->offset));
+        }
+#endif
 
         paResources[i] = pBufferContext->pBuffer;
@@ -5997 +6035 @@
     }
 
+    LogFunc(("idxMaxSlot = %d\n", idxMaxSlot));
     if (idxMaxSlot >= 0)
         pDXDevice->pImmediateContext->IASetVertexBuffers(0, idxMaxSlot + 1, paResources, paStride, paOffset);
@@ -7611 +7650 @@
     pDevice->pImmediateContext->CopySubresourceRegion(pDstResource, DstSubresource, DstX, DstY, DstZ,
                                                       pSrcResource, SrcSubresource, &SrcBox);
+
+#ifdef DUMP_BITMAPS
+    SVGA3dSurfaceImageId image;
+    image.sid = pDstSurface->id;
+    image.face = 0;
+    image.mipmap = 0;
+    VMSVGA3D_MAPPED_SURFACE map;
+    int rc2 = vmsvga3dSurfaceMap(pThisCC, &image, NULL, VMSVGA3D_SURFACE_MAP_READ, &map);
+    if (RT_SUCCESS(rc2))
+    {
+        vmsvga3dMapWriteBmpFile(&map, "copyregion-");
+        vmsvga3dSurfaceUnmap(pThisCC, &image, &map, /* fWritten =  */ false);
+    }
+    else
+        Log(("Map failed %Rrc\n", rc));
+#endif
 
     pDstSurface->pBackendSurface->cidDrawing = pDXContext->cid;