Changeset 46368 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Jun 3, 2013 5:24:51 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: more debugging

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server.h (modified) (1 diff)
• server_clear.c (modified) (2 diffs)
• server_glsl.c (modified) (2 diffs)
• server_misc.c (modified) (5 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server.h

@@ -386 +386 @@
 void crServerInitTmpCtxDispatch();
 
+//#define VBOX_WITH_CRSERVER_DUMPER
 #ifdef VBOX_WITH_CRSERVER_DUMPER
 void crServerDumpCheckTerm();
 int crServerDumpCheckInit();
-void crServerDumpBuffer();
+void crServerDumpBuffer(int idx);
 void crServerDumpTextures();
-
-#define CR_SERVER_DUMP_F_DRAW_BUFF_ENTER 0x01
-#define CR_SERVER_DUMP_F_DRAW_BUFF_LEAVE  0x02
-#define CR_SERVER_DUMP_F_DRAW_TEX_ENTER  0x10
-#define CR_SERVER_DUMP_F_DRAW_TEX_LEAVE   0x20
-
-extern int g_CrDbgDumpDraw;
-bool crServerDumpFilter(int event);
+void crServerDumpShader(GLint id);
+void crServerDumpProgram(GLint id);
+void crServerDumpCurrentProgram();
+void crServerDumpFramesCheck();
+
+extern unsigned long g_CrDbgDumpDraw;
+extern unsigned long g_CrDbgDumpDrawFramesSettings;
+extern unsigned long g_CrDbgDumpDrawFramesAppliedSettings;
+extern unsigned long g_CrDbgDumpDrawFramesCount;
+bool crServerDumpFilter(unsigned long event);
+
+#define CR_SERVER_DUMP_F_DRAW_BUFF_ENTER        0x00000001
+#define CR_SERVER_DUMP_F_DRAW_BUFF_LEAVE        0x00000002
+#define CR_SERVER_DUMP_F_DRAW_TEX_ENTER         0x00000010
+#define CR_SERVER_DUMP_F_DRAW_TEX_LEAVE         0x00000020
+#define CR_SERVER_DUMP_F_DRAW_PROGRAM_ENTER     0x00000100
+#define CR_SERVER_DUMP_F_DRAW_PROGRAM_LEAVE     0x00000200
+
+#define CR_SERVER_DUMP_F_DRAW_ALL (CR_SERVER_DUMP_F_DRAW_BUFF_ENTER | CR_SERVER_DUMP_F_DRAW_BUFF_LEAVE \
+        | CR_SERVER_DUMP_F_DRAW_TEX_ENTER | CR_SERVER_DUMP_F_DRAW_TEX_LEAVE \
+        | CR_SERVER_DUMP_F_DRAW_PROGRAM_ENTER | CR_SERVER_DUMP_F_DRAW_PROGRAM_LEAVE)
+
+#define CR_SERVER_DUMP_F_COMPILE_SHADER         0x00001000
+#define CR_SERVER_DUMP_F_LINK_PROGRAM           0x00002000
+#define CR_SERVER_DUMP_F_SWAPBUFFERS_ENTER      0x00010000
+#define CR_SERVER_DUMP_F_SWAPBUFFERS_LEAVE      0x00020000
 
 #define CR_SERVER_DUMP_IF_ANY(_ev) ((g_CrDbgDumpDraw & (_ev)) && crServerDumpFilter((_ev)))
 
 #define CR_SERVER_DUMP_DRAW_ENTER() do { \
-            if (!CR_SERVER_DUMP_IF_ANY(CR_SERVER_DUMP_F_DRAW_BUFF_ENTER | CR_SERVER_DUMP_F_DRAW_TEX_ENTER)) break; \
+            if (!CR_SERVER_DUMP_IF_ANY(CR_SERVER_DUMP_F_DRAW_BUFF_ENTER | CR_SERVER_DUMP_F_DRAW_TEX_ENTER | CR_SERVER_DUMP_F_DRAW_PROGRAM_ENTER)) break; \
             crServerDumpCheckInit(); \
-            crDmpStrF(cr_server.Recorder.pDumper, "==> %s\n", __FUNCTION__); \
-            if (CR_SERVER_DUMP_IF_ANY(CR_SERVER_DUMP_F_DRAW_BUFF_ENTER)) { \
-                crServerDumpBuffer(); \
-            } \
-            if (CR_SERVER_DUMP_IF_ANY(CR_SERVER_DUMP_F_DRAW_TEX_ENTER)) { \
-                crServerDumpTextures(); \
-            } \
+            crDmpStrF(cr_server.Recorder.pDumper, "==> %s", __FUNCTION__); \
+            if (CR_SERVER_DUMP_IF_ANY(CR_SERVER_DUMP_F_DRAW_PROGRAM_ENTER)) { crServerDumpCurrentProgram(); } \
+            if (CR_SERVER_DUMP_IF_ANY(CR_SERVER_DUMP_F_DRAW_TEX_ENTER)) { crServerDumpTextures(); } \
+            if (CR_SERVER_DUMP_IF_ANY(CR_SERVER_DUMP_F_DRAW_BUFF_ENTER)) { crServerDumpBuffer(-1); } \
+            crDmpStrF(cr_server.Recorder.pDumper, "=================="); \
         } while (0)
 
 #define CR_SERVER_DUMP_DRAW_LEAVE() do { \
-            if (!CR_SERVER_DUMP_IF_ANY(CR_SERVER_DUMP_F_DRAW_BUFF_LEAVE | CR_SERVER_DUMP_F_DRAW_TEX_LEAVE)) break; \
+            if (!CR_SERVER_DUMP_IF_ANY(CR_SERVER_DUMP_F_DRAW_BUFF_LEAVE | CR_SERVER_DUMP_F_DRAW_TEX_LEAVE | CR_SERVER_DUMP_F_DRAW_PROGRAM_LEAVE)) break; \
             crServerDumpCheckInit(); \
-            crDmpStrF(cr_server.Recorder.pDumper, "<== %s\n", __FUNCTION__); \
-            if (CR_SERVER_DUMP_IF_ANY(CR_SERVER_DUMP_F_DRAW_BUFF_LEAVE)) { \
-                crServerDumpBuffer(); \
-            } \
-            if (CR_SERVER_DUMP_IF_ANY(CR_SERVER_DUMP_F_DRAW_TEX_LEAVE)) { \
-                crServerDumpTextures(); \
-            } \
+            crDmpStrF(cr_server.Recorder.pDumper, "<== %s", __FUNCTION__); \
+            if (CR_SERVER_DUMP_IF_ANY(CR_SERVER_DUMP_F_DRAW_BUFF_LEAVE)) { crServerDumpBuffer(-1); } \
+            if (CR_SERVER_DUMP_IF_ANY(CR_SERVER_DUMP_F_DRAW_TEX_LEAVE)) { crServerDumpTextures(); } \
+            if (CR_SERVER_DUMP_IF_ANY(CR_SERVER_DUMP_F_DRAW_PROGRAM_LEAVE)) { crServerDumpCurrentProgram(); } \
+            crDmpStrF(cr_server.Recorder.pDumper, "=================="); \
         } while (0)
+
+#define CR_SERVER_DUMP_COMPILE_SHADER(_id) do { \
+            if (!CR_SERVER_DUMP_IF_ANY(CR_SERVER_DUMP_F_COMPILE_SHADER)) break; \
+            crServerDumpCheckInit(); \
+            crServerDumpShader((_id)); \
+        } while (0)
+
+#define CR_SERVER_DUMP_LINK_PROGRAM(_id) do { \
+            if (!CR_SERVER_DUMP_IF_ANY(CR_SERVER_DUMP_F_LINK_PROGRAM)) break; \
+            crServerDumpCheckInit(); \
+            crServerDumpProgram((_id)); \
+        } while (0)
+
+#define CR_SERVER_DUMP_SWAPBUFFERS_ENTER() do { \
+            if (!g_CrDbgDumpDrawFramesCount && !CR_SERVER_DUMP_IF_ANY(CR_SERVER_DUMP_F_SWAPBUFFERS_ENTER)) break; \
+            crServerDumpCheckInit(); \
+            crDmpStrF(cr_server.Recorder.pDumper, "== %s", __FUNCTION__); \
+            if (CR_SERVER_DUMP_IF_ANY(CR_SERVER_DUMP_F_SWAPBUFFERS_ENTER)) { crServerDumpBuffer(CR_SERVER_FBO_BB_IDX(cr_server.currentMural)); } \
+            if (g_CrDbgDumpDrawFramesCount) { crServerDumpFramesCheck(); } \
+        } while (0)
+
+#define CR_SERVER_DUMP_SWAPBUFFERS_LEAVE() do {} while (0)
 #else /* if !defined VBOX_WITH_CRSERVER_DUMPER */
 #define CR_SERVER_DUMP_DRAW_ENTER() do {} while (0)
 #define CR_SERVER_DUMP_DRAW_LEAVE() do {} while (0)
+#define CR_SERVER_DUMP_COMPILE_SHADER(_id) do {} while (0)
+#define CR_SERVER_DUMP_LINK_PROGRAM(_id) do {} while (0)
+#define CR_SERVER_DUMP_SWAPBUFFERS_ENTER() do {} while (0)
+#define CR_SERVER_DUMP_SWAPBUFFERS_LEAVE() do {} while (0)
 #endif /* !VBOX_WITH_CRSERVER_DUMPER */
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_clear.c

@@ -434 +434 @@
         mural->bFbDraw = GL_FALSE;
 
+    CR_SERVER_DUMP_SWAPBUFFERS_ENTER();
+
     if (crServerIsRedirectedToFBO())
     {
@@ -445 +447 @@
             mural->fDataPresented = GL_TRUE;
     }
+
+    CR_SERVER_DUMP_SWAPBUFFERS_LEAVE();
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_glsl.c

@@ -51 +51 @@
     Assert(iCompileStatus == GL_TRUE);
 #endif
+    CR_SERVER_DUMP_COMPILE_SHADER(shader);
 }
 
@@ -79 +80 @@
     crStateLinkProgram(program);
     cr_server.head_spu->dispatch_table.LinkProgram(crStateGetProgramHWID(program));
+    CR_SERVER_DUMP_LINK_PROGRAM(program);
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_misc.c

@@ -50 +50 @@
     CRASSERT(bytes < 4096);
 
-    cr_server.head_spu->dispatch_table.GetChromiumParametervCR( target, index, type, count, local_storage );
+    switch (target)
+    {
+        case GL_DBG_CHECK_BREAK_CR:
+        {
+            if (bytes > 0)
+            {
+                GLubyte *pbRc = local_storage;
+                GLuint *puRc = (GLuint *)(bytes >=4 ? local_storage : NULL);
+                int rc;
+                memset(local_storage, 0, bytes);
+                if (cr_server.RcToGuestOnce)
+                {
+                    rc = cr_server.RcToGuestOnce;
+                    cr_server.RcToGuestOnce = 0;
+                }
+                else
+                {
+                    rc = cr_server.RcToGuest;
+                }
+                if (puRc)
+                    *puRc = rc;
+                else
+                    *pbRc = !!rc;
+            }
+            else
+            {
+                crWarning("zero bytes for GL_DBG_CHECK_BREAK_CR");
+            }
+            break;
+        }
+        default:
+            cr_server.head_spu->dispatch_table.GetChromiumParametervCR( target, index, type, count, local_storage );
+            break;
+    }
 
     crServerReturnValue( local_storage, bytes );
@@ -1359 +1392 @@
  * 0x03 - dump buffer on enter and exit
  * 0x22 - dump texture and buffer on exit */
-int g_CrDbgDumpDraw = 0; //CR_SERVER_DUMP_F_DRAW_BUFF_ENTER | CR_SERVER_DUMP_F_DRAW_BUFF_LEAVE;
+
+unsigned long g_CrDbgDumpDraw = CR_SERVER_DUMP_F_COMPILE_SHADER | CR_SERVER_DUMP_F_LINK_PROGRAM; //CR_SERVER_DUMP_F_DRAW_BUFF_ENTER | CR_SERVER_DUMP_F_DRAW_BUFF_LEAVE;
+unsigned long g_CrDbgDumpDrawFramesSettings = CR_SERVER_DUMP_F_DRAW_BUFF_ENTER
+        | CR_SERVER_DUMP_F_DRAW_BUFF_LEAVE
+        | CR_SERVER_DUMP_F_DRAW_TEX_ENTER
+        | CR_SERVER_DUMP_F_DRAW_PROGRAM_ENTER
+        | CR_SERVER_DUMP_F_COMPILE_SHADER
+        | CR_SERVER_DUMP_F_LINK_PROGRAM
+        | CR_SERVER_DUMP_F_SWAPBUFFERS_ENTER;
+unsigned long g_CrDbgDumpDrawFramesAppliedSettings = 0;
+unsigned long g_CrDbgDumpDrawFramesSavedInitSettings = 0;
+unsigned long g_CrDbgDumpDrawFramesCount = 0;
 
 void crServerDumpCheckTerm()
@@ -1415 +1459 @@
 }
 
-void crServerDumpBuffer()
+void crServerDumpShader(GLint id)
+{
+    CRContext *ctx = crStateGetCurrent();
+    crRecDumpShader(&cr_server.Recorder, ctx, id, 0);
+}
+
+void crServerDumpProgram(GLint id)
+{
+    CRContext *ctx = crStateGetCurrent();
+    crRecDumpProgram(&cr_server.Recorder, ctx, id, 0);
+}
+
+void crServerDumpCurrentProgram()
+{
+    CRContext *ctx = crStateGetCurrent();
+    crRecDumpCurrentProgram(&cr_server.Recorder, ctx);
+}
+
+void crServerDumpBuffer(int idx)
 {
     CRContextInfo *pCtxInfo = cr_server.currentCtxInfo;
@@ -1421 +1483 @@
     CR_BLITTER_CONTEXT BltCtx;
     CRContext *ctx = crStateGetCurrent();
-    GLint idx = crServerMuralFBOIdxFromBufferName(cr_server.currentMural, pCtxInfo->pContext->buffer.drawBuffer);
     GLint idFBO;
     GLint idTex;
     VBOXVR_TEXTURE RedirTex;
     int rc = crServerDumpCheckInit();
+    idx = idx >= 0 ? idx : crServerMuralFBOIdxFromBufferName(cr_server.currentMural, pCtxInfo->pContext->buffer.drawBuffer);
     if (!RT_SUCCESS(rc))
     {
@@ -1471 +1533 @@
 }
 
-bool crServerDumpFilter(int event)
-{
+bool crServerDumpFilter(unsigned long event)
+{
+    CRContext *ctx = crStateGetCurrent();
+    if ((event & CR_SERVER_DUMP_F_DRAW_ALL)
+            && (!ctx->glsl.activeProgram || ctx->glsl.activeProgram->id != 21))
+        return false;
     return true;
+}
+
+void crServerDumpFramesCheck()
+{
+    if (!g_CrDbgDumpDrawFramesCount)
+        return;
+
+    if (!g_CrDbgDumpDrawFramesAppliedSettings)
+    {
+        if (!g_CrDbgDumpDrawFramesSettings)
+        {
+            crWarning("g_CrDbgDumpDrawFramesSettings is NULL, bump will not be started");
+            g_CrDbgDumpDrawFramesCount = 0;
+            return;
+        }
+
+        g_CrDbgDumpDrawFramesSavedInitSettings = g_CrDbgDumpDraw;
+        g_CrDbgDumpDrawFramesAppliedSettings = g_CrDbgDumpDrawFramesSettings;
+        g_CrDbgDumpDraw = g_CrDbgDumpDrawFramesSettings;
+        g_CrDbgDumpDrawFramesSettings = 0;
+        crDmpStrF(cr_server.Recorder.pDumper, "***Starting draw dump for %d frames, settings(0x%x)", g_CrDbgDumpDrawFramesCount, g_CrDbgDumpDraw);
+        return;
+    }
+
+    --g_CrDbgDumpDrawFramesCount;
+
+    if (!g_CrDbgDumpDrawFramesCount)
+    {
+        crDmpStrF(cr_server.Recorder.pDumper, "***Stop draw dump");
+        g_CrDbgDumpDraw = g_CrDbgDumpDrawFramesSavedInitSettings;
+        g_CrDbgDumpDrawFramesAppliedSettings = 0;
+    }
 }
 #endif