Changeset 49261 in vbox for trunk/src/VBox/GuestHost/OpenGL/state_tracker/dump.cpp

Timestamp:

Oct 23, 2013 4:45:07 PM (11 years ago)

Author:

vboxsync

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

90174

Message:

crOpenGL: dumper fixes

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/dump.cpp (modified) (5 diffs)

trunk/src/VBox/GuestHost/OpenGL/state_tracker/dump.cpp

@@ -603 +603 @@
 }
 
+/* Context activation is done by the caller. */
+void crRecDumpLog(CR_RECORDER *pRec, GLint hwid)
+{
+    GLint cbLog = 0;
+    pRec->pDispatch->GetObjectParameterivARB(hwid, GL_OBJECT_INFO_LOG_LENGTH_ARB, &cbLog);
+
+    crDmpStrF(pRec->pDumper, "Log===%d===", hwid);
+
+    if (cbLog > 1)
+    {
+        GLchar *pszLog = (GLchar *) crAlloc(cbLog*sizeof (GLchar));
+
+        pRec->pDispatch->GetInfoLogARB(hwid, cbLog, NULL, pszLog);
+
+        crRecDumpStrByLine(pRec->pDumper, pszLog, cbLog);
+
+        crFree(pszLog);
+    }
+    crDmpStrF(pRec->pDumper, "End Log======");
+}
+
 void crRecDumpShader(CR_RECORDER *pRec, CRContext *ctx, GLint id, GLint hwid)
 {
@@ -608 +629 @@
     GLint type = 0;
     GLint compileStatus = 0;
+
+#ifndef IN_GUEST
     CRGLSLShader *pShad;
 
@@ -634 +657 @@
     Assert(pShad->hwid == hwid);
     Assert(pShad->id == id);
+#else
+    if (!id)
+        id = hwid;
+    else if (!hwid)
+        hwid = id;
+
+    Assert(id);
+    Assert(hwid);
+    Assert(hwid == id);
+#endif
 
     pRec->pDispatch->GetObjectParameterivARB(hwid, GL_OBJECT_SUBTYPE_ARB, &type);
     pRec->pDispatch->GetObjectParameterivARB(hwid, GL_OBJECT_COMPILE_STATUS_ARB, &compileStatus);
     crDmpStrF(pRec->pDumper, "SHADER ctx(%d) id(%d) hwid(%d) type(%s) status(%d):", ctx->id, id, hwid, crRecDumpShaderTypeString(type, pRec->pDumper), compileStatus);
+
+    crRecDumpLog(pRec, hwid);
 
     pRec->pDispatch->GetObjectParameterivARB(hwid, GL_OBJECT_SHADER_SOURCE_LENGTH_ARB, &length);
@@ -692 +727 @@
 
     crDmpStrF(pRec->pDumper, "PROGRAM ctx(%d) id(%d) hwid(%d) status(%d) shaders(%d):", ctx->id, id, hwid, linkStatus, cShaders);
+
+    crRecDumpLog(pRec, hwid);
 
     GLhandleARB *pShaders = (GLhandleARB*)crCalloc(cShaders * sizeof (*pShaders));
@@ -1586 +1623 @@
 DECLCALLBACK(void) crDmpDumpStrDbgPrint(struct CR_DUMPER * pDumper, const char*pszStr)
 {
-    OutputDebugStringA(pszStr);
+    crDmpPrint("%s\n", pszStr);
 }
 #endif