Changeset 83579 in vbox for trunk

Timestamp:

Apr 6, 2020 12:17:53 AM (5 years ago)

Author:

vboxsync

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

136922

Message:

Devices/Graphics: added helpers to parse and log the shader code, bugref:9639

Location:

trunk/src/VBox/Devices

Files:

• Graphics/DevVGA-SVGA3d-hlp.cpp (added)
• Graphics/DevVGA-SVGA3d-internal.h (modified) (1 diff)
• Graphics/DevVGA-SVGA3d-ogl.cpp (modified) (3 diffs)
• Graphics/DevVGA-SVGA3d-win.cpp (modified) (3 diffs)
• Makefile.kmk (modified) (1 diff)

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

@@ -1395 +1395 @@
 #endif
 
+int vmsvga3dShaderParse(uint32_t cbShaderData, uint32_t const *pShaderData);
+void vmsvga3dShaderLogRel(char const *pszMsg, SVGA3dShaderType type, uint32_t cbShaderData, uint32_t const *pShaderData);
+
 #endif /* !VBOX_INCLUDED_SRC_Graphics_DevVGA_SVGA3d_internal_h */
 

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

@@ -6835 +6835 @@
 
     Log(("vmsvga3dShaderDefine cid=%u shid=%d type=%s cbData=0x%x\n", cid, shid, (type == SVGA3D_SHADERTYPE_VS) ? "VERTEX" : "PIXEL", cbData));
-    Log3(("shader code:\n%.*Rhxd\n", cbData, pShaderData));
 
     PVMSVGA3DCONTEXT pContext;
@@ -6841 +6840 @@
     AssertRCReturn(rc, rc);
 
+    AssertReturn(shid < SVGA3D_MAX_SHADER_IDS, VERR_INVALID_PARAMETER);
+
+    rc = vmsvga3dShaderParse(cbData, pShaderData);
+    if (RT_FAILURE(rc))
+    {
+        AssertRC(rc);
+        vmsvga3dShaderLogRel("Failed to parse", type, cbData, pShaderData);
+        return rc;
+    }
+
     VMSVGA3D_SET_CURRENT_CONTEXT(pState, pContext);
 
-    AssertReturn(shid < SVGA3D_MAX_SHADER_IDS, VERR_INVALID_PARAMETER);
     if (type == SVGA3D_SHADERTYPE_VS)
     {
@@ -6918 +6926 @@
     if (rc != VINF_SUCCESS)
     {
+        vmsvga3dShaderLogRel("Failed to create", type, cbData, pShaderData);
+
         RTMemFree(pShader->pShaderProgram);
         memset(pShader, 0, sizeof(*pShader));

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

@@ -5413 +5413 @@
 
     Log(("vmsvga3dShaderDefine %x shid=%x type=%s cbData=%x\n", cid, shid, (type == SVGA3D_SHADERTYPE_VS) ? "VERTEX" : "PIXEL", cbData));
-#ifdef LOG_ENABLED
-    Log3(("Shader code:\n"));
-    const uint32_t cTokensPerLine = 8;
-    const uint32_t *paTokens = (uint32_t *)pShaderData;
-    const uint32_t cTokens = cbData / sizeof(uint32_t);
-    for (uint32_t iToken = 0; iToken < cTokens; ++iToken)
-    {
-        if ((iToken % cTokensPerLine) == 0)
-        {
-            if (iToken == 0)
-                Log3(("0x%08X,", paTokens[iToken]));
-            else
-                Log3(("\n0x%08X,", paTokens[iToken]));
-        }
-        else
-            Log3((" 0x%08X,", paTokens[iToken]));
-    }
-    Log3(("\n"));
-#endif
 
     PVMSVGA3DCONTEXT pContext;
@@ -5438 +5419 @@
 
     AssertReturn(shid < SVGA3D_MAX_SHADER_IDS, VERR_INVALID_PARAMETER);
+
+    rc = vmsvga3dShaderParse(cbData, pShaderData);
+    if (RT_FAILURE(rc))
+    {
+        AssertRC(rc);
+        vmsvga3dShaderLogRel("Failed to parse", type, cbData, pShaderData);
+        return rc;
+    }
+
     if (type == SVGA3D_SHADERTYPE_VS)
     {
@@ -5511 +5501 @@
     {
         /* Dump the shader code. */
-        static int scLogged = 0;
-        if (scLogged < 8)
-        {
-            ++scLogged;
-
-            LogRel(("VMSVGA: Failed to create %s shader:\n", (type == SVGA3D_SHADERTYPE_VS) ? "VERTEX" : "PIXEL"));
-            const uint32_t cTokensPerLine = 8;
-            const uint32_t *paTokens = (uint32_t *)pShaderData;
-            const uint32_t cTokens = cbData / sizeof(uint32_t);
-            for (uint32_t iToken = 0; iToken < cTokens; ++iToken)
-            {
-                if ((iToken % cTokensPerLine) == 0)
-                {
-                    if (iToken == 0)
-                        LogRel(("0x%08X,", paTokens[iToken]));
-                    else
-                        LogRel(("\n0x%08X,", paTokens[iToken]));
-                }
-                else
-                    LogRel((" 0x%08X,", paTokens[iToken]));
-            }
-            LogRel(("\n"));
-        }
+        vmsvga3dShaderLogRel("Failed to create", type, cbData, pShaderData);
 
         RTMemFree(pShader->pShaderProgram);

trunk/src/VBox/Devices/Makefile.kmk

@@ -295 +295 @@
   VBoxDD_SOURCES        += \
         Graphics/DevVGA-SVGA3d.cpp \
+        Graphics/DevVGA-SVGA3d-hlp.cpp \
         Graphics/DevVGA-SVGA3d-info.cpp \
         Graphics/DevVGA-SVGA3d-shared.cpp \