Changeset 85938 in vbox for trunk

Timestamp:

Aug 28, 2020 6:28:26 PM (4 years ago)

Author:

vboxsync

Message:

Devices/Graphics: fixed a couple of log statements and updated optional debug code to dump all active textures

File:

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

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

@@ -5153 +5153 @@
     AssertReturn(!cVertexDivisor || cVertexDivisor == numVertexDecls, VERR_INVALID_PARAMETER);
 
+#if 0
+    /* Dump render target to a bitmap. */
+    if (pContext->state.aRenderTargets[SVGA3D_RT_COLOR0] != SVGA3D_INVALID_ID)
+    {
+        vmsvga3dUpdateHeapBuffersForSurfaces(pThisCC, pContext->state.aRenderTargets[SVGA3D_RT_COLOR0]);
+        PVMSVGA3DSURFACE pSurface;
+        int rc2 = vmsvga3dSurfaceFromSid(pState, pContext->state.aRenderTargets[SVGA3D_RT_COLOR0], &pSurface);
+        if (RT_SUCCESS(rc2))
+            vmsvga3dInfoSurfaceToBitmap(NULL, pSurface, "bmpd3d", "rt", "-pre");
+    }
+    for (int iTex = 0; iTex < SVGA3D_MAX_SAMPLERS_PS; ++iTex)
+    {
+        IDirect3DBaseTexture9 *pBaseTexture = 0;
+        hr = pContext->pDevice->GetTexture(iTex, &pBaseTexture);
+        if (hr == S_OK && pBaseTexture)
+        {
+            D3DSURFACE_DESC surfDesc;
+            RT_ZERO(surfDesc);
+
+            IDirect3DTexture9 *pTexture = (IDirect3DTexture9 *)pBaseTexture;
+            pTexture->GetLevelDesc(0, &surfDesc);
+
+            Log(("Texture[%d]: %dx%d\n",
+                 iTex, surfDesc.Width, surfDesc.Height));
+            D3D_RELEASE(pBaseTexture);
+        }
+    }
+#endif
+
     /*
      * Process all vertex declarations. Each vertex buffer surface is represented by one stream source id.
@@ -5348 +5377 @@
 
             /* Render with an index buffer */
-            Log(("DrawIndexedPrimitive %x startindex=%d numVertices=%d, primitivecount=%d index format=%s index bias=%d stride=%d\n",
-                 PrimitiveTypeD3D, pVertexDecl[0].rangeHint.first,  numVertices, pRange[iPrimitive].primitiveCount,
+            Log(("DrawIndexedPrimitive %x startindex=%d (indexArray.offset 0x%x) range [%d:%d) numVertices=%d, primitivecount=%d index format=%s index bias=%d stride=%d\n",
+                 PrimitiveTypeD3D, pRange[iPrimitive].indexArray.offset / pRange[iPrimitive].indexWidth, pRange[iPrimitive].indexArray.offset,
+                 pVertexDecl[0].rangeHint.first, pVertexDecl[0].rangeHint.last, numVertices, pRange[iPrimitive].primitiveCount,
                  (pRange[iPrimitive].indexWidth == sizeof(uint16_t)) ? "D3DFMT_INDEX16" : "D3DFMT_INDEX32",
                  pRange[iPrimitive].indexBias, strideVertex));
@@ -5424 +5454 @@
             vmsvga3dInfoSurfaceToBitmap(NULL, pSurface, "bmpd3d", "rt", "-post");
 # if 0
-        /* Stage 0 texture. */
-        if (pContext->aSidActiveTextures[0] != SVGA3D_INVALID_ID)
-        {
-            vmsvga3dUpdateHeapBuffersForSurfaces(pThisCC, pContext->aSidActiveTextures[0]);
-            rc2 = vmsvga3dSurfaceFromSid(pState, pContext->aSidActiveTextures[0], &pSurface);
-            if (RT_SUCCESS(rc2))
-                vmsvga3dInfoSurfaceToBitmap(NULL, pSurface, "bmpd3d", "rt", "-post-tx");
+        for (i = 0; i < SVGA3D_MAX_SAMPLERS_PS; ++i)
+        {
+            if (pContext->aSidActiveTextures[i] != SVGA3D_INVALID_ID)
+            {
+                char szSuffix[32];
+                RTStrPrintf2(szSuffix, sizeof(szSuffix), "-tx%d", i);
+                vmsvga3dUpdateHeapBuffersForSurfaces(pThisCC, pContext->aSidActiveTextures[i]);
+                rc2 = vmsvga3dSurfaceFromSid(pState, pContext->aSidActiveTextures[i], &pSurface);
+                if (RT_SUCCESS(rc2))
+                    vmsvga3dInfoSurfaceToBitmap(NULL, pSurface, "bmpd3d", "rt", szSuffix);
+            }
         }
 # endif
@@ -5478 +5512 @@
     AssertReturn(pState, VERR_NO_MEMORY);
 
-    Log(("vmsvga3dShaderDefine %x shid=%x type=%s cbData=%x\n", cid, shid, (type == SVGA3D_SHADERTYPE_VS) ? "VERTEX" : "PIXEL", cbData));
+    Log(("vmsvga3dShaderDefine %x shid=%d type=%s cbData=%d\n", cid, shid, (type == SVGA3D_SHADERTYPE_VS) ? "VERTEX" : "PIXEL", cbData));
 
     PVMSVGA3DCONTEXT pContext;
@@ -5585 +5619 @@
     PVMSVGA3DSHADER       pShader = NULL;
 
-    Log(("vmsvga3dShaderDestroy %x shid=%x type=%s\n", cid, shid, (type == SVGA3D_SHADERTYPE_VS) ? "VERTEX" : "PIXEL"));
+    Log(("vmsvga3dShaderDestroy %x shid=%d type=%s\n", cid, shid, (type == SVGA3D_SHADERTYPE_VS) ? "VERTEX" : "PIXEL"));
 
     PVMSVGA3DCONTEXT pContext;