Changeset 46453 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Timestamp:

Jun 7, 2013 9:27:03 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: more dump/debug stuff

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server.h (modified) (8 diffs)
• server_glsl.c (modified) (1 diff)
• server_misc.c (modified) (3 diffs)

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

@@ -398 +398 @@
 void crServerDumpFramesCheck();
 void crServerDumpState();
+void crServerDumpDrawel(const char*pszFormat, ...);
+void crServerDumpDrawelv(GLuint idx, const char*pszElFormat, uint32_t cbEl, const void *pvVal, uint32_t cVal);
+
 
 extern unsigned long g_CrDbgDumpEnabled;
@@ -461 +464 @@
 #define CR_SERVER_DUMP_F_DRAW_STATE_ENTER                0x00000004
 #define CR_SERVER_DUMP_F_DRAW_STATE_LEAVE                0x00000008
-
 #define CR_SERVER_DUMP_F_DRAW_ENTER_ALL (CR_SERVER_DUMP_F_DRAW_BUFF_ENTER \
         | CR_SERVER_DUMP_F_DRAW_TEX_ENTER \
@@ -477 +479 @@
 
 #define CR_SERVER_DUMP_F_COMPILE_SHADER         0x00001000
-#define CR_SERVER_DUMP_F_LINK_PROGRAM           0x00002000
+#define CR_SERVER_DUMP_F_SHADER_SOURCE          0x00002000
+#define CR_SERVER_DUMP_F_LINK_PROGRAM           0x00004000
 #define CR_SERVER_DUMP_F_SWAPBUFFERS_ENTER      0x00010000
 #define CR_SERVER_DUMP_F_SWAPBUFFERS_LEAVE      0x00020000
+#define CR_SERVER_DUMP_F_DRAWEL                 0x00100000
+
 
 #define CR_SERVER_DUMP_DEFAULT_FILTER_OP(_ev) ((((_ev) & g_CrDbgDumpDraw) != 0) \
@@ -505 +510 @@
             crServerDumpCheckInit(); \
             crDmpStrF(cr_server.Recorder.pDumper, "<== %s", __FUNCTION__); \
+            if (CR_SERVER_DUMP_FILTER_DMP(CR_SERVER_DUMP_F_DRAW_TEX_LEAVE, cr_server.Recorder.pDumper)) { crServerDumpTextures(); } \
             if (CR_SERVER_DUMP_FILTER_DMP(CR_SERVER_DUMP_F_DRAW_BUFF_LEAVE, cr_server.Recorder.pDumper)) { crServerDumpBuffer(-1); } \
-            if (CR_SERVER_DUMP_FILTER_DMP(CR_SERVER_DUMP_F_DRAW_TEX_LEAVE, cr_server.Recorder.pDumper)) { crServerDumpTextures(); } \
             if (CR_SERVER_DUMP_FILTER_DMP(CR_SERVER_DUMP_F_DRAW_PROGRAM_UNIFORMS_LEAVE, cr_server.Recorder.pDumper)) { crServerDumpCurrentProgramUniforms(); } \
             if (CR_SERVER_DUMP_FILTER_DMP(CR_SERVER_DUMP_F_DRAW_PROGRAM_LEAVE, cr_server.Recorder.pDumper)) { crServerDumpCurrentProgram(); } \
@@ -516 +521 @@
             if (!CR_SERVER_DUMP_FILTER_OP(CR_SERVER_DUMP_F_COMPILE_SHADER, cr_server.Recorder.pDumper)) break; \
             crServerDumpCheckInit(); \
+            crDmpStrF(cr_server.Recorder.pDumper, "== %s", __FUNCTION__); \
             crServerDumpShader((_id)); \
+            crDmpStrF(cr_server.Recorder.pDumper, "====="); \
+        } while (0)
+
+#define CR_SERVER_DUMP_SHADER_SOURCE(_id) do { \
+            if (!CR_SERVER_DUMP_FILTER_OP(CR_SERVER_DUMP_F_SHADER_SOURCE, cr_server.Recorder.pDumper)) break; \
+            crServerDumpCheckInit(); \
+            crDmpStrF(cr_server.Recorder.pDumper, "== %s", __FUNCTION__); \
+            crServerDumpShader((_id)); \
+            crDmpStrF(cr_server.Recorder.pDumper, "====="); \
         } while (0)
 
@@ -522 +537 @@
             if (!CR_SERVER_DUMP_FILTER_OP(CR_SERVER_DUMP_F_LINK_PROGRAM, cr_server.Recorder.pDumper)) break; \
             crServerDumpCheckInit(); \
+            crDmpStrF(cr_server.Recorder.pDumper, "== %s", __FUNCTION__); \
             crServerDumpProgram((_id)); \
+            crDmpStrF(cr_server.Recorder.pDumper, "====="); \
         } while (0)
 
@@ -536 +553 @@
             if (!CR_SERVER_DUMP_FILTER_OP(CR_SERVER_DUMP_F_SWAPBUFFERS_LEAVE, cr_server.Recorder.pDumper)) break; \
             crServerDumpCheckInit(); \
-        } while (0)
+            crDmpStrF(cr_server.Recorder.pDumper, "== %s", __FUNCTION__); \
+        } while (0)
+
+#define CR_SERVER_DUMP_DRAWEL_F(_msg) do { \
+        if (!CR_SERVER_DUMP_FILTER_OP(CR_SERVER_DUMP_F_DRAWEL, cr_server.Recorder.pDumper)) break; \
+        crServerDumpCheckInit(); \
+        crDmpStrF(cr_server.Recorder.pDumper, "== %s", __FUNCTION__); \
+        crServerDumpDrawel _msg; \
+    } while (0)
+
+#define CR_SERVER_DUMP_DRAWEL_V(_index, _pszElFormat, _cbEl, _pvVal, _cVal) do { \
+        if (!CR_SERVER_DUMP_FILTER_OP(CR_SERVER_DUMP_F_DRAWEL, cr_server.Recorder.pDumper)) break; \
+        crServerDumpCheckInit(); \
+        crDmpStrF(cr_server.Recorder.pDumper, "== %s", __FUNCTION__); \
+        crServerDumpDrawelv((_index), (_pszElFormat), (_cbEl), (_pvVal), (_cVal)); \
+    } while (0)
 #else /* if !defined VBOX_WITH_CRSERVER_DUMPER */
 #define CR_SERVER_DUMP_DRAW_ENTER() do {} while (0)
@@ -544 +576 @@
 #define CR_SERVER_DUMP_SWAPBUFFERS_ENTER() do {} while (0)
 #define CR_SERVER_DUMP_SWAPBUFFERS_LEAVE() do {} while (0)
+#define CR_SERVER_DUMP_SHADER_SOURCE() do {} while (0)
+#define CR_SERVER_DUMP_DRAWEL_F(_msg) do {} while (0)
+#define CR_SERVER_DUMP_DRAWEL_V(_pszElFormat, _cbEl, _pvVal, _cVal) do {} while (0)
 #endif /* !VBOX_WITH_CRSERVER_DUMPER */
 

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

@@ -38 +38 @@
     CRASSERT(err == GL_NO_ERROR);
 #endif
+    CR_SERVER_DUMP_SHADER_SOURCE(shader);
 }
 

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

@@ -1398 +1398 @@
         | CR_SERVER_DUMP_F_DRAW_BUFF_LEAVE
         | CR_SERVER_DUMP_F_DRAW_PROGRAM_UNIFORMS_ENTER
-        | 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_STATE_ENTER
         | CR_SERVER_DUMP_F_SWAPBUFFERS_ENTER
+        | CR_SERVER_DUMP_F_DRAWEL
         ; //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
@@ -1495 +1496 @@
 {
     CRContext *ctx = crStateGetCurrent();
-    Assert(0);
     crRecDumpGlGetState(&cr_server.Recorder, ctx);
     crRecDumpGlEnableState(&cr_server.Recorder, ctx);
+}
+
+void crServerDumpDrawel(const char*pszFormat, ...)
+{
+    CRContext *ctx = crStateGetCurrent();
+    va_list pArgList;
+    va_start(pArgList, pszFormat);
+    crRecDumpVertAttrV(&cr_server.Recorder, ctx, pszFormat, pArgList);
+    va_end(pArgList);
+}
+
+void crServerDumpDrawelv(GLuint idx, const char*pszElFormat, uint32_t cbEl, const void *pvVal, uint32_t cVal)
+{
+    CRContext *ctx = crStateGetCurrent();
+    crRecDumpVertAttrv(&cr_server.Recorder, ctx, idx, pszElFormat, cbEl, pvVal, cVal);
 }
 
@@ -1556 +1571 @@
 }
 
-static uint32_t g_VDbgCDraws = 0;
-static uint32_t g_VDbgCFrames = 0;
-static uint32_t g_VDbgDoFrameDump = 0;
-static uint32_t g_VDbgInitFrameDump = 0;
-
-
 bool crServerDumpFilterOp(unsigned long event, CR_DUMPER *pDumper)
 {
-    CRContext *ctx = crStateGetCurrent();
-    if (event & CR_SERVER_DUMP_F_DRAW_ALL)
-    {
-        if(!ctx->glsl.activeProgram || ctx->glsl.activeProgram->id != 21)
-            return false;
-
-        if (event & CR_SERVER_DUMP_F_DRAW_ENTER_ALL)
-        {
-            ++g_VDbgCDraws;
-//            crDmpStrF(cr_server.Recorder.pDumper, "DRAW(%d:%d)", g_VDbgCFrames, g_VDbgCDraws);
-        }
-
-        if (!g_VDbgDoFrameDump)
-            return false;
-
-#define CR_SERVER_DUMP_MARKER_ENTER_STR "VBox.Cr.DrawEnter"
-#define CR_SERVER_DUMP_MARKER_LEAVE_STR "VBox.Cr.DrawLeave"
-
-        if (0)//(g_VDbgCFrames == 53 && g_VDbgCDraws == 13)
-        {
-            if (event & CR_SERVER_DUMP_F_DRAW_ENTER_ALL)
-                cr_server.head_spu->dispatch_table.StringMarkerGREMEDY(sizeof (CR_SERVER_DUMP_MARKER_ENTER_STR), CR_SERVER_DUMP_MARKER_ENTER_STR);
-            else
-                cr_server.head_spu->dispatch_table.StringMarkerGREMEDY(sizeof (CR_SERVER_DUMP_MARKER_LEAVE_STR), CR_SERVER_DUMP_MARKER_LEAVE_STR);
-        }
-    }
-    else if (event & CR_SERVER_DUMP_F_SWAPBUFFERS_ENTER)
-    {
-        bool fSkip = true;
-        ++g_VDbgCFrames;
-//        crDmpStrF(cr_server.Recorder.pDumper, "FRAME(%d)", g_VDbgCFrames);
-        g_VDbgCDraws = 0;
-        if (g_VDbgDoFrameDump)
-        {
-            g_VDbgDoFrameDump = 0;
-            fSkip = false;
-        }
-
-        if (g_VDbgInitFrameDump)
-        {
-            g_VDbgDoFrameDump = 1;
-            g_VDbgInitFrameDump = 0;
-        }
-
-        if (fSkip)
-            return false;
-    }
-
     return CR_SERVER_DUMP_DEFAULT_FILTER_OP(event);
 }