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

Timestamp:

Jun 4, 2023 10:32:59 AM (18 months ago)

Author:

vboxsync

Message:

Devices/Graphics: debug logging. bugref:9830

File:

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

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

@@ -6268 +6268 @@
             break;
         }
+        case DXGI_FORMAT_R32G32_SINT:
+        {
+            int32_t const *pValues = (int32_t const *)pvElementData;
+            Log8(("{ %d, %d },",
+                 pValues[0], pValues[1]));
+            break;
+        }
+        case DXGI_FORMAT_R32G32_UINT:
+        {
+            uint32_t const *pValues = (uint32_t const *)pvElementData;
+            Log8(("{ %u, %u },",
+                 pValues[0], pValues[1]));
+            break;
+        }
+        case DXGI_FORMAT_R32_SINT:
+        {
+            int32_t const *pValues = (int32_t const *)pvElementData;
+            Log8(("{ %d },",
+                 pValues[0]));
+            break;
+        }
+        case DXGI_FORMAT_R32_UINT:
+        {
+            uint32_t const *pValues = (uint32_t const *)pvElementData;
+            Log8(("{ %u },",
+                 pValues[0]));
+            break;
+        }
         case DXGI_FORMAT_R16G16_SINT:
         {
@@ -6304 +6332 @@
 
 
-static void dxDbgDumpVertices_Draw(PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext, uint32_t vertexCount, uint32_t startVertexLocation)
+static void dxDbgDumpVertexData(PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext, uint32_t vertexCount, uint32_t startVertexLocation)
 {
     PVMSVGA3DBACKEND pBackend = pThisCC->svga.p3dState->pBackend;
@@ -6366 +6394 @@
 
 
-static void dxDbgDumpVertices_DrawIndexed(PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext, uint32_t indexCount, uint32_t startIndexLocation, int32_t baseVertexLocation)
+static void dxDbgDumpIndexedVertexData(PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext, uint32_t indexCount, uint32_t startIndexLocation, int32_t baseVertexLocation)
 {
     PVMSVGA3DBACKEND pBackend = pThisCC->svga.p3dState->pBackend;
     DXDEVICE *pDXDevice = dxDeviceFromContext(pThisCC->svga.p3dState, pDXContext);
     SVGA3dSurfaceImageId image;
-//DEBUG_BREAKPOINT_TEST();
+
     DXBOUNDINDEXBUFFER *pIB = &pBackend->resources.inputAssembly.indexBuffer;
     uint32_t const sidIB = pDXContext->svgaDXContext.inputAssembly.indexBufferSid;
@@ -6436 +6464 @@
                     {
                         D3D11_INPUT_ELEMENT_DESC *pElement = &pDXElementLayout->aElementDesc[iElement];
+                        if (pElement->InputSlotClass != D3D11_INPUT_PER_VERTEX_DATA)
+                            continue;
+
                         if (pElement->InputSlot == iSlot)
                         {
@@ -6455 +6486 @@
         RTMemFree(pvIndexBuffer);
     }
+}
+
+
+static void dxDbgDumpInstanceData(PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext, uint32_t instanceCount, uint32_t startInstanceLocation)
+{
+    PVMSVGA3DBACKEND pBackend = pThisCC->svga.p3dState->pBackend;
+    SVGA3dSurfaceImageId image;
+
+    /*
+     * Dump per-instance data.
+     */
+    for (uint32_t iInstance = 0; iInstance < instanceCount; ++iInstance)
+    {
+        for (uint32_t iSlot = 0; iSlot < SVGA3D_DX_MAX_VERTEXBUFFERS; ++iSlot)
+        {
+            DXBOUNDVERTEXBUFFER *pVB = &pBackend->resources.inputAssembly.vertexBuffers[iSlot];
+            uint32_t const sidVB = pDXContext->svgaDXContext.inputAssembly.vertexBuffers[iSlot].bufferId;
+            if (sidVB == SVGA3D_INVALID_ID)
+            {
+                Assert(pVB->pBuffer == 0);
+                continue;
+            }
+
+            Assert(pVB->pBuffer);
+
+            image.sid = sidVB;
+            image.face = 0;
+            image.mipmap = 0;
+
+            VMSVGA3D_MAPPED_SURFACE mapVB;
+            int rc = vmsvga3dBackSurfaceMap(pThisCC, &image, NULL, VMSVGA3D_SURFACE_MAP_READ, &mapVB);
+            AssertRC(rc);
+            if (RT_SUCCESS(rc))
+            {
+                uint8_t const *pu8VertexData = (uint8_t *)mapVB.pvData;
+                pu8VertexData += pVB->offset;
+                pu8VertexData += startInstanceLocation * pVB->stride;
+
+                SVGA3dElementLayoutId const elementLayoutId = pDXContext->svgaDXContext.inputAssembly.layoutId;
+                DXELEMENTLAYOUT *pDXElementLayout = &pDXContext->pBackendDXContext->paElementLayout[elementLayoutId];
+                Assert(pDXElementLayout->cElementDesc > 0);
+
+                Log8(("Instance data dump: sid = %u, iInstance %u, startInstanceLocation %d, offset = %d, stride = %d:\n",
+                      sidVB, iInstance, startInstanceLocation, pVB->offset, pVB->stride));
+
+                Log8(("slot[%u] i%u { ", iSlot, iInstance));
+                for (uint32_t iElement = 0; iElement < pDXElementLayout->cElementDesc; ++iElement)
+                {
+                    D3D11_INPUT_ELEMENT_DESC *pElement = &pDXElementLayout->aElementDesc[iElement];
+                    if (pElement->InputSlotClass != D3D11_INPUT_PER_INSTANCE_DATA)
+                        continue;
+
+                    if (pElement->InputSlot == iSlot)
+                    {
+                        uint8_t const *pu8Vertex = pu8VertexData + iInstance * pVB->stride;
+                        dxDbgLogVertexElement(pElement->Format, pu8Vertex + pElement->AlignedByteOffset);
+                    }
+                }
+                Log8((" }\n"));
+
+                vmsvga3dBackSurfaceUnmap(pThisCC, &image, &mapVB, /* fWritten =  */ false);
+            }
+        }
+    }
+}
+
+static void dxDbgDumpVertices_Draw(PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext, uint32_t vertexCount, uint32_t startVertexLocation)
+{
+    dxDbgDumpVertexData(pThisCC, pDXContext, vertexCount, startVertexLocation);
+}
+
+
+static void dxDbgDumpVertices_DrawIndexed(PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext, uint32_t indexCount, uint32_t startIndexLocation, int32_t baseVertexLocation)
+{
+    dxDbgDumpIndexedVertexData(pThisCC, pDXContext, indexCount, startIndexLocation, baseVertexLocation);
+}
+
+
+static void dxDbgDumpVertices_DrawInstanced(PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext,
+                                            uint32_t vertexCountPerInstance, uint32_t instanceCount,
+                                            uint32_t startVertexLocation, uint32_t startInstanceLocation)
+{
+    dxDbgDumpVertexData(pThisCC, pDXContext, vertexCountPerInstance, startVertexLocation);
+    dxDbgDumpInstanceData(pThisCC, pDXContext, instanceCount, startInstanceLocation);
+}
+
+
+static void dxDbgDumpVertices_DrawIndexedInstanced(PVGASTATECC pThisCC, PVMSVGA3DDXCONTEXT pDXContext,
+                                                   uint32_t indexCountPerInstance, uint32_t instanceCount,
+                                                   uint32_t startIndexLocation, int32_t baseVertexLocation,
+                                                   uint32_t startInstanceLocation)
+{
+    dxDbgDumpIndexedVertexData(pThisCC, pDXContext, indexCountPerInstance, startIndexLocation, baseVertexLocation);
+    dxDbgDumpInstanceData(pThisCC, pDXContext, instanceCount, startInstanceLocation);
 }
 #endif
@@ -7226 +7351 @@
     dxSetupPipeline(pThisCC, pDXContext);
 
+#ifdef LOG_ENABLED
+    if (LogIs8Enabled())
+        dxDbgDumpVertices_DrawInstanced(pThisCC, pDXContext, vertexCountPerInstance, instanceCount, startVertexLocation, startInstanceLocation);
+#endif
+
     Assert(pDXContext->svgaDXContext.inputAssembly.topology != SVGA3D_PRIMITIVE_TRIANGLEFAN);
 
@@ -7251 +7381 @@
 
     dxSetupPipeline(pThisCC, pDXContext);
+
+#ifdef LOG_ENABLED
+    if (LogIs8Enabled())
+        dxDbgDumpVertices_DrawIndexedInstanced(pThisCC, pDXContext, indexCountPerInstance, instanceCount, startIndexLocation, baseVertexLocation, startInstanceLocation);
+#endif
 
     Assert(pDXContext->svgaDXContext.inputAssembly.topology != SVGA3D_PRIMITIVE_TRIANGLEFAN);