Changeset 48897 in vbox

Timestamp:

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

Author:

vboxsync

Message:

crOpenGL: dumping stuff

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/cr_dump.h (modified) (1 diff)
• GuestHost/OpenGL/state_tracker/dump.cpp (modified) (4 diffs)
• HostServices/SharedOpenGL/crserverlib/server.h (modified) (4 diffs)
• HostServices/SharedOpenGL/crserverlib/server_misc.c (modified) (2 diffs)
• HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/OpenGL/include/cr_dump.h

@@ -136 +136 @@
 VBOXDUMPDECL(void) crRecDumpBuffer(CR_RECORDER *pRec, CRContext *ctx, CR_BLITTER_CONTEXT *pCurCtx, CR_BLITTER_WINDOW *pCurWin, GLint idRedirFBO, VBOXVR_TEXTURE *pRedirTex);
 VBOXDUMPDECL(void) crRecDumpTextures(CR_RECORDER *pRec, CRContext *ctx, CR_BLITTER_CONTEXT *pCurCtx, CR_BLITTER_WINDOW *pCurWin);
+VBOXDUMPDECL(void) crRecDumpTextureV(CR_RECORDER *pRec, const VBOXVR_TEXTURE *pTex, CR_BLITTER_CONTEXT *pCurCtx, CR_BLITTER_WINDOW *pCurWin, const char *pszStr, va_list pArgList);
+VBOXDUMPDECL(void) crRecDumpTextureF(CR_RECORDER *pRec, const VBOXVR_TEXTURE *pTex, CR_BLITTER_CONTEXT *pCurCtx, CR_BLITTER_WINDOW *pCurWin, const char *pszStr, ...);
+VBOXDUMPDECL(void) crRecDumpTextureByIdV(CR_RECORDER *pRec, CRContext *ctx, GLint id, CR_BLITTER_CONTEXT *pCurCtx, CR_BLITTER_WINDOW *pCurWin, const char *pszStr, va_list pArgList);
+VBOXDUMPDECL(void) crRecDumpTextureByIdF(CR_RECORDER *pRec, CRContext *ctx, GLint id, CR_BLITTER_CONTEXT *pCurCtx, CR_BLITTER_WINDOW *pCurWin, const char *pszStr, ...);
 VBOXDUMPDECL(void) crRecDumpShader(CR_RECORDER *pRec, CRContext *ctx, GLint id, GLint hwid);
 VBOXDUMPDECL(void) crRecDumpProgram(CR_RECORDER *pRec, CRContext *ctx, GLint id, GLint hwid);

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

@@ -1232 +1232 @@
 }
 
+void crRecDumpTextureV(CR_RECORDER *pRec, const VBOXVR_TEXTURE *pTex, CR_BLITTER_CONTEXT *pCurCtx, CR_BLITTER_WINDOW *pCurWin, const char *pszStr, va_list pArgList)
+{
+    CR_BLITTER_IMG Img = {0};
+    int rc = CrBltEnter(pRec->pBlitter, pCurCtx, pCurWin);
+    if (RT_SUCCESS(rc))
+    {
+        rc = CrBltImgGetTex(pRec->pBlitter, pTex, GL_BGRA, &Img);
+        if (RT_SUCCESS(rc))
+        {
+            crDmpImgV(pRec->pDumper, &Img, pszStr, pArgList);
+            CrBltImgFree(pRec->pBlitter, &Img);
+        }
+        else
+        {
+            crWarning("CrBltImgGetTex failed, rc %d", rc);
+        }
+        CrBltLeave(pRec->pBlitter);
+    }
+    else
+    {
+        crWarning("CrBltEnter failed, rc %d", rc);
+    }
+}
+
+void crRecDumpTextureF(CR_RECORDER *pRec, const VBOXVR_TEXTURE *pTex, CR_BLITTER_CONTEXT *pCurCtx, CR_BLITTER_WINDOW *pCurWin, const char *pszStr, ...)
+{
+    va_list pArgList;
+    va_start(pArgList, pszStr);
+    crRecDumpTextureV(pRec, pTex, pCurCtx, pCurWin, pszStr, pArgList);
+    va_end(pArgList);
+}
+
+void crRecDumpTextureByIdV(CR_RECORDER *pRec, CRContext *ctx, GLint id, CR_BLITTER_CONTEXT *pCurCtx, CR_BLITTER_WINDOW *pCurWin, const char *pszStr, va_list pArgList)
+{
+    CRTextureObj *pTobj = (CRTextureObj *)crHashtableSearch(ctx->shared->textureTable, id);
+    if (!pTobj)
+    {
+        crWarning("no texture of id %d", id);
+        return;
+    }
+
+    CRTextureLevel *pTl = &pTobj->level[0][0 /* level */];
+    VBOXVR_TEXTURE Tex;
+    Tex.width = pTl->width;
+    Tex.height = pTl->height;
+    Tex.target = pTobj->target;
+    Assert(Tex.target == GL_TEXTURE_2D);
+    Tex.hwid = pTobj->hwid;
+    if (!Tex.hwid)
+    {
+        crWarning("no texture hwid of id %d", id);
+        return;
+    }
+
+    crRecDumpTextureV(pRec, &Tex, pCurCtx, pCurWin, pszStr, pArgList);
+}
+
+void crRecDumpTextureByIdF(CR_RECORDER *pRec, CRContext *ctx, GLint id, CR_BLITTER_CONTEXT *pCurCtx, CR_BLITTER_WINDOW *pCurWin, const char *pszStr, ...)
+{
+    va_list pArgList;
+    va_start(pArgList, pszStr);
+    crRecDumpTextureByIdV(pRec, ctx, id, pCurCtx, pCurWin, pszStr, pArgList);
+    va_end(pArgList);
+}
+
 void crRecDumpTextures(CR_RECORDER *pRec, CRContext *ctx, CR_BLITTER_CONTEXT *pCurCtx, CR_BLITTER_WINDOW *pCurWin)
 {
@@ -1238 +1303 @@
     GLint restoreTexUnit = 0;
     GLint curProgram = 0;
-    int rc;
     int i;
 
@@ -1294 +1358 @@
         {
             GLint hwTex = 0;
-            CR_BLITTER_IMG Img = {0};
             VBOXVR_TEXTURE Tex;
 
@@ -1327 +1390 @@
                 }
 
-                rc = CrBltEnter(pRec->pBlitter, pCurCtx, pCurWin);
-                if (RT_SUCCESS(rc))
-                {
-                    rc = CrBltImgGetTex(pRec->pBlitter, &Tex, GL_BGRA, &Img);
-                    if (RT_SUCCESS(rc))
-                    {
-                        crDmpImgF(pRec->pDumper, &Img, "ctx(%d), Unit %d: TEXTURE_2D id(%d) hwid(%d), width(%d), height(%d)", ctx, i, pTobj->id, pTobj->hwid, width, height);
-                        CrBltImgFree(pRec->pBlitter, &Img);
-                    }
-                    else
-                    {
-                        crWarning("CrBltImgGetTex failed, rc %d", rc);
-                    }
-                    CrBltLeave(pRec->pBlitter);
-                }
-                else
-                {
-                    crWarning("CrBltEnter failed, rc %d", rc);
-                }
+                crRecDumpTextureF(pRec, &Tex, pCurCtx, pCurWin, "ctx(%d), Unit %d: TEXTURE_2D id(%d) hwid(%d), width(%d), height(%d)", ctx, i, pTobj->id, pTobj->hwid, width, height);
             }
 //            else

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);