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

Timestamp:

Oct 4, 2013 7:35:58 PM (12 years ago)

Author:

vboxsync

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

89577

Message:

crOpenGL: dumping stuff

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server.h (modified) (4 diffs)
• server_misc.c (modified) (2 diffs)
• server_presenter.cpp (modified) (1 diff)

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

@@ -468 +468 @@
 void crServerDumpBuffer(int idx);
 void crServerDumpTextures();
+void crServerDumpTexture(const VBOXVR_TEXTURE *pTex);
 void crServerDumpShader(GLint id);
 void crServerDumpProgram(GLint id);
@@ -564 +565 @@
 #define CR_SERVER_DUMP_F_SWAPBUFFERS_ENTER      0x00010000
 #define CR_SERVER_DUMP_F_SWAPBUFFERS_LEAVE      0x00020000
+#define CR_SERVER_DUMP_F_TEXPRESENT             0x00040000
 #define CR_SERVER_DUMP_F_DRAWEL                 0x00100000
 #define CR_SERVER_DUMP_F_COMPILE_SHADER         0x01000000
@@ -641 +643 @@
         } while (0)
 
+#define CR_SERVER_DUMP_TEXPRESENT(_pTex) do { \
+            if (!CR_SERVER_DUMP_FILTER_OP(CR_SERVER_DUMP_F_TEXPRESENT, cr_server.Recorder.pDumper)) break; \
+            crServerDumpCheckInit(); \
+            crDmpStrF(cr_server.Recorder.pDumper, "==[%d] %s==", (uint32_t)cr_server.curClient->pid, __FUNCTION__); \
+            crServerDumpTexture((_pTex)); \
+        } while (0)
+
 #define CR_SERVER_DUMP_SWAPBUFFERS_LEAVE() do { \
             if (!CR_SERVER_DUMP_FILTER_OP(CR_SERVER_DUMP_F_SWAPBUFFERS_LEAVE, cr_server.Recorder.pDumper)) break; \
@@ -666 +675 @@
 #define CR_SERVER_DUMP_COMPILE_SHADER(_id) do {} while (0)
 #define CR_SERVER_DUMP_LINK_PROGRAM(_id) do {} while (0)
+#define CR_SERVER_DUMP_TEXPRESENT(_pTex) do {} while (0)
 #define CR_SERVER_DUMP_SWAPBUFFERS_ENTER() do {} while (0)
 #define CR_SERVER_DUMP_SWAPBUFFERS_LEAVE() do {} while (0)

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

@@ -1590 +1590 @@
 }
 
-void crServerDumpTextures()
+void crServerDumpTexture(const VBOXVR_TEXTURE *pTex)
 {
     CRContextInfo *pCtxInfo = cr_server.currentCtxInfo;
@@ -1606 +1606 @@
     crServerVBoxBlitterCtxInit(&BltCtx, pCtxInfo);
 
+    crRecDumpTextureF(&cr_server.Recorder, pTex, &BltCtx, &BltWin, "Tex (%d x %d), hwid (%d) target %#x", pTex->width, pTex->height, pTex->hwid, pTex->target);
+}
+
+void crServerDumpTextures()
+{
+    CRContextInfo *pCtxInfo = cr_server.currentCtxInfo;
+    CR_BLITTER_WINDOW BltWin;
+    CR_BLITTER_CONTEXT BltCtx;
+    CRContext *ctx = crStateGetCurrent();
+    int rc = crServerDumpCheckInit();
+    if (!RT_SUCCESS(rc))
+    {
+        crWarning("crServerDumpCheckInit failed, rc %d", rc);
+        return;
+    }
+
+    crServerVBoxBlitterWinInit(&BltWin, cr_server.currentMural);
+    crServerVBoxBlitterCtxInit(&BltCtx, pCtxInfo);
+
     crRecDumpTextures(&cr_server.Recorder, ctx, &BltCtx, &BltWin);
 }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp

@@ -948 +948 @@
     }
 
+    if (!(cfg & CR_PRESENT_FLAG_CLEAR_RECTS))
+    {
+        CR_SERVER_DUMP_TEXPRESENT(&pEntry->CEntry.Tex);
+    }
+
     CrDpEnter(pDisplay);