Changeset 102616 in vbox for trunk/src

Timestamp:

Dec 15, 2023 5:22:23 PM (17 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

160771

Message:

Devices/Graphics: debug logging.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA-cmd.cpp (modified) (2 diffs)
• DevVGA-SVGA3d-dx-dx11.cpp (modified) (11 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA-cmd.cpp

@@ -1486 +1486 @@
 static int vmsvga3dBmpWrite(const char *pszFilename, VMSVGA3D_MAPPED_SURFACE const *pMap)
 {
-    if (   pMap->cbBlock != 4 && pMap->cbBlock != 1
+    if (   pMap->cbBlock != 4 && pMap->cbBlock != 2 && pMap->cbBlock != 1
         && pMap->format != SVGA3D_R16G16B16A16_FLOAT
         && pMap->format != SVGA3D_R32G32B32A32_FLOAT)
@@ -1601 +1601 @@
         {
             fwrite(s, 1, pMap->cbRow, f);
+
+            s += pMap->cbRowPitch;
+        }
+    }
+    else if (pMap->cbBlock == 2)
+    {
+        const uint8_t *s = (uint8_t *)pMap->pvData;
+        for (uint32_t iRow = 0; iRow < pMap->cRows; ++iRow)
+        {
+            for (int32_t x = 0; x < w; ++x)
+            {
+                uint16_t const *pPixel = (uint16_t *)(s + x * sizeof(uint16_t));
+                uint32_t u32Pixel = *pPixel;
+                fwrite(&u32Pixel, 1, 4, f);
+            }
 
             s += pMap->cbRowPitch;

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

@@ -5885 +5885 @@
             for (unsigned i = 0; i < sizeInBytes / sizeof(float) / 4; ++i)
             {
-                Log(("ConstantF[%d]: " FLOAT_FMT_STR ", " FLOAT_FMT_STR ", " FLOAT_FMT_STR ", " FLOAT_FMT_STR ",\n",
-                     i, FLOAT_FMT_ARGS(pValuesF[i*4 + 0]), FLOAT_FMT_ARGS(pValuesF[i*4 + 1]), FLOAT_FMT_ARGS(pValuesF[i*4 + 2]), FLOAT_FMT_ARGS(pValuesF[i*4 + 3])));
+                Log8(("ConstF /*%d*/ " FLOAT_FMT_STR ", " FLOAT_FMT_STR ", " FLOAT_FMT_STR ", " FLOAT_FMT_STR ",\n",
+                      i, FLOAT_FMT_ARGS(pValuesF[i*4 + 0]), FLOAT_FMT_ARGS(pValuesF[i*4 + 1]), FLOAT_FMT_ARGS(pValuesF[i*4 + 2]), FLOAT_FMT_ARGS(pValuesF[i*4 + 3])));
             }
         }
@@ -6419 +6419 @@
         {
             uint16_t const *pValues = (uint16_t const *)pvElementData;
-            Log8(("{ f16 " FLOAT_FMT_STR ", " FLOAT_FMT_STR " },",
+            Log8(("{ /*f16*/ " FLOAT_FMT_STR ", " FLOAT_FMT_STR " },",
                  FLOAT_FMT_ARGS(float16ToFloat(pValues[0])), FLOAT_FMT_ARGS(float16ToFloat(pValues[1]))));
             break;
@@ -6454 +6454 @@
         {
             int16_t const *pValues = (int16_t const *)pvElementData;
-            Log8(("{ s %d, %d },",
+            Log8(("{ /*s16*/ %d, %d },",
                  pValues[0], pValues[1]));
             break;
@@ -6461 +6461 @@
         {
             uint16_t const *pValues = (uint16_t const *)pvElementData;
-            Log8(("{ u %u, %u },",
+            Log8(("{ /*u16*/ %u, %u },",
                  pValues[0], pValues[1]));
             break;
         }
+        case DXGI_FORMAT_R16G16_SNORM:
+        {
+            int16_t const *pValues = (int16_t const *)pvElementData;
+            Log8(("{ /*sn16*/ 0x%x, 0x%x },",
+                 pValues[0], pValues[1]));
+            break;
+        }
+        case DXGI_FORMAT_R16G16_UNORM:
+        {
+            uint16_t const *pValues = (uint16_t const *)pvElementData;
+            Log8(("{ /*un16*/ 0x%x, 0x%x },",
+                 pValues[0], pValues[1]));
+            break;
+        }
+        case DXGI_FORMAT_R16_UINT:
+        {
+            uint16_t const *pValues = (uint16_t const *)pvElementData;
+            Log8(("{ /*u16*/ %u },",
+                 pValues[0]));
+            break;
+        }
         case DXGI_FORMAT_R8G8B8A8_UNORM:
         {
             uint8_t const *pValues = (uint8_t const *)pvElementData;
-            Log8(("{ 8unorm  %u, %u, %u, %u },",
+            Log8(("{ /*8unorm*/  %u, %u, %u, %u },",
                  pValues[0], pValues[1], pValues[2], pValues[3]));
             break;
@@ -6475 +6496 @@
         {
             uint8_t const *pValues = (uint8_t const *)pvElementData;
-            Log8(("{ 8unorm  %u, %u },",
+            Log8(("{ /*8unorm*/  %u, %u },",
                  pValues[0], pValues[1]));
+            break;
+        }
+        case DXGI_FORMAT_R8_UINT:
+        {
+            uint8_t const *pValues = (uint8_t const *)pvElementData;
+            Log8(("{ /*8unorm*/  %u },",
+                 pValues[0]));
             break;
         }
@@ -6526 +6554 @@
             for (uint32_t v = 0; v < vertexCount; ++v)
             {
-                Log8(("slot[%u] v%u { ", iSlot, startVertexLocation + v));
+                Log8(("slot[%u] /* v%u */ { ", iSlot, startVertexLocation + v));
 
                 for (uint32_t iElement = 0; iElement < pDXElementLayout->cElementDesc; ++iElement)
@@ -6614 +6642 @@
                         Index = ((uint32_t *)pu8IndexData)[i];
 
-                    Log8(("slot[%u] v%u { ", iSlot, Index));
+                    Log8(("slot[%u] /* v%u */ { ", iSlot, Index));
 
                     for (uint32_t iElement = 0; iElement < pDXElementLayout->cElementDesc; ++iElement)
@@ -6686 +6714 @@
                       sidVB, iInstance, startInstanceLocation, pVB->offset, pVB->stride));
 
-                Log8(("slot[%u] i%u { ", iSlot, iInstance));
+                Log8(("slot[%u] /* i%u */ { ", iSlot, iInstance));
                 for (uint32_t iElement = 0; iElement < pDXElementLayout->cElementDesc; ++iElement)
                 {
@@ -6804 +6832 @@
                 }
 
-                LogFunc(("srv[%d][%d] sid = %u, srvid = %u, format = %s(%d)\n", idxShaderState, idxSR, sid, shaderResourceViewId, vmsvgaLookupEnum((int)pSRViewEntry->format, &g_SVGA3dSurfaceFormat2String), pSRViewEntry->format));
+                LogFunc(("srv[%d][%d] sid = %u, srvid = %u, format = %s(%d), %dx%d\n",
+                         idxShaderState, idxSR, sid, shaderResourceViewId, vmsvgaLookupEnum((int)pSRViewEntry->format, &g_SVGA3dSurfaceFormat2String), pSRViewEntry->format,
+                         pSurface->paMipmapLevels[0].cBlocksX * pSurface->cxBlock, pSurface->paMipmapLevels[0].cBlocksY * pSurface->cyBlock));
 
 #ifdef DUMP_BITMAPS
@@ -7136 +7166 @@
 
     pDevice->pImmediateContext->IASetInputLayout(pInputLayout);
+
+    LogFunc(("Topology %u\n", pDXContext->svgaDXContext.inputAssembly.topology));
+    LogFunc(("Blend id %u\n", pDXContext->svgaDXContext.renderState.blendStateId));
 }
 
@@ -7710 +7743 @@
 static D3D11_PRIMITIVE_TOPOLOGY dxTopology(SVGA3dPrimitiveType primitiveType)
 {
+    ASSERT_GUEST_RETURN(primitiveType < SVGA3D_PRIMITIVE_MAX, D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED);
+
     static D3D11_PRIMITIVE_TOPOLOGY const aD3D11PrimitiveTopology[SVGA3D_PRIMITIVE_MAX] =
     {