Changeset 69922 in vbox

Timestamp:

Dec 4, 2017 6:24:57 PM (7 years ago)

Author:

vboxsync

Message:

Devices/Graphics: VMSVGA: info vmsvga3dsurf debugger command.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA.cpp (modified) (3 diffs)
• DevVGA-SVGA3d-info.cpp (modified) (5 diffs)
• DevVGA-SVGA3d-internal.h (modified) (1 diff)
• DevVGA-SVGA3d-win.cpp (modified) (2 diffs)
• DevVGA-SVGA3d.h (modified) (1 diff)

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

@@ -4616 +4616 @@
 DECLCALLBACK(void) vmsvgaR3Info3dSurface(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
-    /* There might be a specific context ID at the start of the
-       arguments, if not show all contexts. */
-    uint32_t cid = UINT32_MAX;
+    /* There might be a specific surface ID at the start of the
+       arguments, if not show all surfaces. */
+    uint32_t sid = UINT32_MAX;
     if (pszArgs)
         pszArgs = RTStrStripL(pszArgs);
     if (pszArgs && RT_C_IS_DIGIT(*pszArgs))
-        cid = RTStrToUInt32(pszArgs);
+        sid = RTStrToUInt32(pszArgs);
 
     /* Verbose or terse display, we default to verbose. */
@@ -4651 +4651 @@
         fInvY = true;
 
-    vmsvga3dInfoSurfaceWorker(PDMINS_2_DATA(pDevIns, PVGASTATE), pHlp, cid, fVerbose, cxAscii, fInvY);
+    vmsvga3dInfoSurfaceWorker(PDMINS_2_DATA(pDevIns, PVGASTATE), pHlp, sid, fVerbose, cxAscii, fInvY, NULL);
+}
+
+
+/**
+ * @callback_method_impl{FNDBGFHANDLERDEV, "vmsvga3dsurf"}
+ */
+DECLCALLBACK(void) vmsvgaR3Info3dSurfaceBmp(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
+{
+    /* pszArg = "sid[>dir]"
+     * Writes %dir%/info-S-sidI.bmp, where S - sequential bitmap number, I - decimal surface id.
+     */
+    char *pszBitmapPath = NULL;
+    uint32_t sid = UINT32_MAX;
+    if (pszArgs)
+        pszArgs = RTStrStripL(pszArgs);
+    if (pszArgs && RT_C_IS_DIGIT(*pszArgs))
+        RTStrToUInt32Ex(pszArgs, &pszBitmapPath, 0, &sid);
+    if (   pszBitmapPath
+        && *pszBitmapPath == '>')
+        ++pszBitmapPath;
+
+    const bool fVerbose = true;
+    const uint32_t cxAscii = 0; /* No ASCII */
+    const bool fInvY = false;   /* Do not invert. */
+    vmsvga3dInfoSurfaceWorker(PDMINS_2_DATA(pDevIns, PVGASTATE), pHlp, sid, fVerbose, cxAscii, fInvY, pszBitmapPath);
 }
 
@@ -5332 +5357 @@
                               "Accepts 'terse', 'invy', and one of 'tiny', 'medium', 'normal', 'big', 'huge', or 'gigantic'.",
                               vmsvgaR3Info3dSurface);
+    PDMDevHlpDBGFInfoRegister(pDevIns, "vmsvga3dsurf",
+                              "VMSVGA 3d surface details and bitmap: "
+                              "sid[>dir]",
+                              vmsvgaR3Info3dSurfaceBmp);
 # endif
 

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

@@ -20 +20 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#include <stdio.h>
 #define LOG_GROUP LOG_GROUP_DEV_VMSVGA
 #include <VBox/vmm/pdmdev.h>
@@ -831 +832 @@
      * Skip stuff we can't or won't need to handle.
      */
-    if (!cx || !cy)
+    if (!cx || !cy || !cchMaxX || !cchMaxY)
         return;
     switch (enmFormat)
@@ -1812 +1813 @@
 
 
+static int vmsvga3dInfoBmpWrite(const char *pszFilename, const void *pvBits, int w, int h, uint32_t cbPixel, uint32_t u32Mask)
+{
+    if (   cbPixel != 4
+        && cbPixel != 2
+        && cbPixel != 1)
+        return VERR_NOT_SUPPORTED;
+
+    /* Always write BGRX bitmap for now. */
+    const int cbBitmap = w * h * 4;
+
+    FILE *f = fopen(pszFilename, "wb");
+    if (!f)
+        return VERR_FILE_NOT_FOUND;
+
+    BITMAPFILEHEADER bf;
+    bf.bfType = 'MB';
+    bf.bfSize = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + cbBitmap;
+    bf.bfReserved1 = 0;
+    bf.bfReserved2 = 0;
+    bf.bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER);
+
+    BITMAPINFOHEADER bi;
+    bi.biSize = sizeof(bi);
+    bi.biWidth = w;
+    bi.biHeight = -h;
+    bi.biPlanes = 1;
+    bi.biBitCount = 32;
+    bi.biCompression = 0;
+    bi.biSizeImage = cbBitmap;
+    bi.biXPelsPerMeter = 0;
+    bi.biYPelsPerMeter = 0;
+    bi.biClrUsed = 0;
+    bi.biClrImportant = 0;
+
+    fwrite(&bf, 1, sizeof(bf), f);
+    fwrite(&bi, 1, sizeof(bi), f);
+
+    if (cbPixel == 4)
+    {
+        const uint32_t *s = (uint32_t *)pvBits;
+        int i;
+        for (i = 0; i < w * h; ++i)
+        {
+            const uint32_t u32 = *s++;
+            uint32_t u = u32 & u32Mask;
+            fwrite(&u, 1, 4, f);
+        }
+    }
+    else if (cbPixel == 2)
+    {
+        const uint16_t *s = (uint16_t *)pvBits;
+        int i;
+        for (i = 0; i < w * h; ++i)
+        {
+            const uint16_t u16 = *s++;
+            uint32_t u32 = u16;
+            uint32_t u = u32 & u32Mask;
+            fwrite(&u, 1, 4, f);
+        }
+    }
+    else if (cbPixel == 1)
+    {
+        const uint8_t *s = (uint8_t *)pvBits;
+        int i;
+        for (i = 0; i < w * h; ++i)
+        {
+            const uint8_t u8 = *s++;
+            uint32_t u32 = u8 * 0x10000 + u8 * 0x100 + u8;
+            uint32_t u = u32 & u32Mask;
+            fwrite(&u, 1, 4, f);
+        }
+    }
+
+    fclose(f);
+
+    return VINF_SUCCESS;
+}
+
+void vmsvga3dInfoSurfaceToBitmap(PCDBGFINFOHLP pHlp, PVMSVGA3DSURFACE pSurface,
+                                 const char *pszPath, const char *pszNamePrefix, const char *pszNameSuffix)
+{
+    static volatile uint32_t sSeq = 0;
+
+    if (!pSurface->pMipmapLevels[0].pSurfaceData)
+        return;
+
+    const uint32_t u32Seq = ASMAtomicIncU32(&sSeq);
+
+    char szFilepath[4096];
+    RTStrPrintf(szFilepath, sizeof(szFilepath),
+                "%s\\%s-%u-sid%u%s.bmp",
+                pszPath, pszNamePrefix, u32Seq, pSurface->id, pszNameSuffix);
+
+    const uint32_t cbPixel = vmsvga3dSurfaceFormatSize(pSurface->format, NULL, NULL);
+    int rc = vmsvga3dInfoBmpWrite(szFilepath,
+                                  pSurface->pMipmapLevels[0].pSurfaceData,
+                                  pSurface->pMipmapLevels[0].mipmapSize.width,
+                                  pSurface->pMipmapLevels[0].mipmapSize.height,
+                                  cbPixel, 0xFFFFFFFF);
+    if (RT_SUCCESS(rc))
+    {
+        Log(("Bitmap: %s\n", szFilepath));
+        if (pHlp)
+            pHlp->pfnPrintf(pHlp, "Bitmap: %s\n", szFilepath);
+    }
+    else
+    {
+        Log(("Bitmap: %s %Rrc\n", szFilepath, rc));
+        if (pHlp)
+            pHlp->pfnPrintf(pHlp, "Bitmap: %s %Rrc\n", szFilepath, rc);
+    }
+
+#if 0
+    /* Alpha channel alone. */
+    RTStrPrintf(szFilepath, sizeof(szFilepath),
+                "%s\\%s-%u-sid%u%s-a.bmp",
+                pszPath, pszNamePrefix, u32Seq, pSurface->id, pszNameSuffix);
+    vmsvga3dInfoBmpWrite(szFilepath,
+                         pSurface->pMipmapLevels[0].pSurfaceData,
+                         pSurface->pMipmapLevels[0].mipmapSize.width,
+                         pSurface->pMipmapLevels[0].mipmapSize.height,
+                         cbPixel, 0xFF000000);
+#endif
+}
+
 static void vmsvga3dInfoSurfaceWorkerOne(PCDBGFINFOHLP pHlp, PVMSVGA3DSURFACE pSurface,
                                          bool fVerbose, uint32_t cxAscii, bool fInvY)
@@ -1918 +2044 @@
 
 
-void vmsvga3dInfoSurfaceWorker(PVGASTATE pThis, PCDBGFINFOHLP pHlp, uint32_t sid, bool fVerbose, uint32_t cxAscii, bool fInvY)
+void vmsvga3dInfoSurfaceWorker(PVGASTATE pThis, PCDBGFINFOHLP pHlp, uint32_t sid, bool fVerbose, uint32_t cxAscii, bool fInvY, const char *pszBitmapPath)
 {
     /* Warning! This code is currently racing papSurfaces reallocation! */
@@ -1939 +2065 @@
                         vmsvga3dSurfaceUpdateHeapBuffersOnFifoThread(pThis, sid);
                     vmsvga3dInfoSurfaceWorkerOne(pHlp, pSurface, fVerbose, cxAscii, fInvY);
+                    if (pszBitmapPath && *pszBitmapPath)
+                        vmsvga3dInfoSurfaceToBitmap(pHlp, pSurface, pszBitmapPath, "info", "");
                     return;
                 }

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-internal.h

@@ -1227 +1227 @@
 int vmsvga3dOcclusionQueryGetData(PVMSVGA3DSTATE pState, PVMSVGA3DCONTEXT pContext, uint32_t *pu32Pixels);
 
-#endif
-
+void vmsvga3dInfoSurfaceToBitmap(PCDBGFINFOHLP pHlp, PVMSVGA3DSURFACE pSurface,
+                                 const char *pszPath, const char *pszNamePrefix, const char *pszNameSuffix);
+
+#endif
+

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

@@ -2929 +2929 @@
 
                 /* Recreate the surface with the original settings; destroys the contents, but that seems fairly safe since the context is also destroyed. */
+#ifdef DEBUG_sunlover
                 /** @todo not safe with shared objects */
                 Assert(pSurface->pSharedObjectTree == NULL);
+#endif
 
                 rc = vmsvga3dSurfaceDestroy(pThis, sid);
@@ -5993 +5995 @@
     }
 
+#if 0
+    /* Dump render target to a bitmap. */
+    if (pContext->state.aRenderTargets[SVGA3D_RT_COLOR0] != SVGA3D_INVALID_ID)
+    {
+        vmsvga3dUpdateHeapBuffersForSurfaces(pThis, 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, "bmp", "rt", "-post");
+    }
+#endif
+
     return rc;
 }

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d.h

@@ -121 +121 @@
 void vmsvga3dUpdateHeapBuffersForSurfaces(PVGASTATE pThis, uint32_t sid);
 void vmsvga3dInfoContextWorker(PVGASTATE pThis, PCDBGFINFOHLP pHlp, uint32_t cid, bool fVerbose);
-void vmsvga3dInfoSurfaceWorker(PVGASTATE pThis, PCDBGFINFOHLP pHlp, uint32_t sid, bool fVerbose, uint32_t cxAscii, bool fInvY);
+void vmsvga3dInfoSurfaceWorker(PVGASTATE pThis, PCDBGFINFOHLP pHlp, uint32_t sid, bool fVerbose, uint32_t cxAscii, bool fInvY, const char *pszBitmapPath);