Changeset 95034 in vbox

Timestamp:

May 17, 2022 5:21:47 PM (3 years ago)

Author:

vboxsync

Message:

Devices/Graphics: minor fixes: bugref:9830

File:

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

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

@@ -2093 +2093 @@
 }
 
+
+static DXGI_FORMAT dxGetDxgiTypelessFormat(DXGI_FORMAT dxgiFormat)
+{
+    switch (dxgiFormat)
+    {
+        case DXGI_FORMAT_B8G8R8A8_UNORM:
+        case DXGI_FORMAT_B8G8R8X8_UNORM :
+        case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
+        case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
+        case DXGI_FORMAT_B8G8R8X8_TYPELESS:
+        case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
+            return DXGI_FORMAT_B8G8R8A8_TYPELESS;
+        /** @todo Other _TYPELESS formats. */
+        default:
+            break;
+    }
+
+    return dxgiFormat;
+}
+
+
 static int vmsvga3dBackSurfaceCreateTexture(PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext, PVMSVGA3DSURFACE pSurface)
 {
@@ -2115 +2136 @@
     AssertRCReturn(rc, rc);
 
-    uint32_t const cWidth = pSurface->paMipmapLevels[0].mipmapSize.width;
-    uint32_t const cHeight = pSurface->paMipmapLevels[0].mipmapSize.height;
+    uint32_t const cWidth = pSurface->paMipmapLevels[0].cBlocksX * pSurface->cxBlock;
+    uint32_t const cHeight = pSurface->paMipmapLevels[0].cBlocksY * pSurface->cyBlock;
     uint32_t const cDepth = pSurface->paMipmapLevels[0].mipmapSize.depth;
     uint32_t const numMipLevels = pSurface->cLevels;
@@ -2122 +2143 @@
     DXGI_FORMAT dxgiFormat = vmsvgaDXSurfaceFormat2Dxgi(pSurface->format);
     AssertReturn(dxgiFormat != DXGI_FORMAT_UNKNOWN, E_FAIL);
+
+    dxgiFormat = dxGetDxgiTypelessFormat(dxgiFormat);
 
     /*
@@ -2688 +2711 @@
             bd.Usage = D3D11_USAGE_DYNAMIC;
         else if (pSurface->f.surfaceFlags & SVGA3D_SURFACE_HINT_STATIC)
-            bd.Usage = D3D11_USAGE_IMMUTABLE;
+            bd.Usage = pInitialData ? D3D11_USAGE_IMMUTABLE : D3D11_USAGE_DEFAULT; /* Guest will update later. */
         else if (pSurface->f.surfaceFlags & SVGA3D_SURFACE_HINT_INDIRECT_UPDATE)
             bd.Usage = D3D11_USAGE_DEFAULT;