Changeset 49172 in vbox

Timestamp:

Oct 17, 2013 7:34:35 PM (11 years ago)

Author:

vboxsync

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

90045

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) (12 diffs)
• HostServices/SharedOpenGL/crserverlib/server_misc.c (modified) (10 diffs)

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

@@ -159 +159 @@
 VBOXDUMPDECL(void) crRecDumpTexGen(CR_RECORDER *pRec, CRContext *ctx);
 
+VBOXDUMPDECL(int) crRecAlphaImgCreate(const CR_BLITTER_IMG *pImg, CR_BLITTER_IMG *pAlphaImg);
+VBOXDUMPDECL(void) crRecAlphaImgDestroy(CR_BLITTER_IMG *pImg);
+
+
 typedef DECLCALLBACKPTR(GLuint, PFNCRDUMPGETHWID)(void *pvObj);
 void* crDmpHashtableSearchByHwid(CRHashTable *pHash, GLuint hwid, PFNCRDUMPGETHWID pfnGetHwid, unsigned long *pKey);

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

@@ -34 +34 @@
 #ifdef VBOX_WITH_CRDUMPER
 
-static uint32_t g_CrDbgDumpRecTexInfo = 0;
+static uint32_t g_CrDbgDumpRecTexInfo = 1;
+static uint32_t g_CrDbgDumpAlphaData = 1;
 
 /* dump stuff */
@@ -463 +464 @@
     {
         crDmpImgF(pRec->pDumper, &Img, "ctx(%d), BUFFER: id(%d) hwid(%d), width(%d), height(%d)", ctx, id, Tex.hwid, width, height);
+
+        if (g_CrDbgDumpAlphaData)
+        {
+            CR_BLITTER_IMG AlphaImg = {0};
+            rc = crRecAlphaImgCreate(&Img, &AlphaImg);
+            if (RT_SUCCESS(rc))
+            {
+                crDmpImgF(pRec->pDumper, &AlphaImg, "Buffer ALPHA Data");
+                crRecAlphaImgDestroy(&AlphaImg);
+            }
+            else
+            {
+                crWarning("crRecAlphaImgCreate failed rc %d", rc);
+            }
+        }
+
         CrBltImgFree(pRec->pBlitter, &Img);
     }
@@ -1232 +1249 @@
 }
 
+int crRecAlphaImgCreate(const CR_BLITTER_IMG *pImg, CR_BLITTER_IMG *pAlphaImg)
+{
+    if (pImg->enmFormat != GL_RGBA
+            && pImg->enmFormat != GL_BGRA)
+    {
+        crWarning("unsupported format 0x%x", pImg->enmFormat);
+        return VERR_NOT_IMPLEMENTED;
+    }
+
+    pAlphaImg->bpp = 32;
+    pAlphaImg->pitch = pImg->width * 4;
+    pAlphaImg->cbData = pAlphaImg->pitch * pImg->height;
+    pAlphaImg->enmFormat = GL_BGRA;
+    pAlphaImg->width = pImg->width;
+    pAlphaImg->height = pImg->height;
+
+    pAlphaImg->pvData = RTMemAlloc(pAlphaImg->cbData);
+    if (!pAlphaImg->pvData)
+    {
+        crWarning("RTMemAlloc failed");
+        return VERR_NO_MEMORY;
+    }
+
+    uint8_t *pu8SrcBuf = (uint8_t*)pImg->pvData;
+    uint8_t *pu8DstBuf = (uint8_t*)pAlphaImg->pvData;
+    for (uint32_t ih = 0; ih < pAlphaImg->height; ++ih)
+    {
+        uint32_t *pu32SrcBuf = (uint32_t*)pu8SrcBuf;
+        uint32_t *pu32DstBuf = (uint32_t*)pu8DstBuf;
+        for (uint32_t iw = 0; iw < pAlphaImg->width; ++iw)
+        {
+            uint8_t alpha = (((*pu32SrcBuf) >> 24) & 0xff);
+            *pu32DstBuf = (0xff << 24) || (alpha << 16) || (alpha << 8) || alpha;
+            ++pu32SrcBuf;
+            ++pu32DstBuf;
+        }
+        pu8SrcBuf += pImg->pitch;
+        pu8DstBuf += pAlphaImg->pitch;
+    }
+
+    return VINF_SUCCESS;
+}
+
+void crRecAlphaImgDestroy(CR_BLITTER_IMG *pImg)
+{
+    RTMemFree(pImg->pvData);
+    pImg->pvData = NULL;
+}
+
 void crRecDumpTextureV(CR_RECORDER *pRec, const VBOXVR_TEXTURE *pTex, CR_BLITTER_CONTEXT *pCurCtx, CR_BLITTER_WINDOW *pCurWin, const char *pszStr, va_list pArgList)
 {
@@ -1242 +1308 @@
         {
             crDmpImgV(pRec->pDumper, &Img, pszStr, pArgList);
+            if (g_CrDbgDumpAlphaData)
+            {
+                CR_BLITTER_IMG AlphaImg = {0};
+                rc = crRecAlphaImgCreate(&Img, &AlphaImg);
+                if (RT_SUCCESS(rc))
+                {
+                    crDmpImgF(pRec->pDumper, &AlphaImg, "Texture ALPHA Data");
+                    crRecAlphaImgDestroy(&AlphaImg);
+                }
+                else
+                {
+                    crWarning("crRecAlphaImgCreate failed rc %d", rc);
+                }
+            }
             CrBltImgFree(pRec->pBlitter, &Img);
         }

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

@@ -488 +488 @@
 extern unsigned long g_CrDbgDumpDrawFramesCount;
 
+extern uint32_t g_CrDbgDumpVertattrFixupOn;
+
 bool crServerDumpFilterDmp(unsigned long event, CR_DUMPER *pDumper);
-bool crServerDumpFilterOp(unsigned long event, CR_DUMPER *pDumper);
+bool crServerDumpFilterOpEnter(unsigned long event, CR_DUMPER *pDumper);
+void crServerDumpFilterOpLeave(unsigned long event, CR_DUMPER *pDumper);
 
 //#define CR_SERVER_DUMP_MASK_OP                  0x0000fffc
@@ -581 +584 @@
                         || (g_CrDbgDumpPid > 0 && ((uint64_t)g_CrDbgDumpPid) == cr_server.curClient->pid) \
                         || (g_CrDbgDumpPid < 0 && ((uint64_t)(-g_CrDbgDumpPid)) != cr_server.curClient->pid)) \
-                && crServerDumpFilterOp((_ev), (_pDumper)))
+                && crServerDumpFilterOpEnter((_ev), (_pDumper)))
 #define CR_SERVER_DUMP_FILTER_DMP(_ev, _pDumper) (crServerDumpFilterDmp((_ev), (_pDumper)))
 
@@ -595 +598 @@
             if (CR_SERVER_DUMP_FILTER_DMP(CR_SERVER_DUMP_F_DRAW_BUFF_ENTER, cr_server.Recorder.pDumper)) { crServerDumpBuffer(-1); } \
             crDmpStrF(cr_server.Recorder.pDumper, "==Done ENTER[%d] %s==", (uint32_t)cr_server.curClient->pid, __FUNCTION__); \
+            crServerDumpFilterOpLeave(CR_SERVER_DUMP_F_DRAW_ENTER_ALL, cr_server.Recorder.pDumper); \
         } while (0)
 
@@ -608 +612 @@
             if (CR_SERVER_DUMP_FILTER_DMP(CR_SERVER_DUMP_F_DRAW_STATE_LEAVE, cr_server.Recorder.pDumper)) { crServerDumpState(); } \
             crDmpStrF(cr_server.Recorder.pDumper, "==Done LEAVE[%d] %s==", (uint32_t)cr_server.curClient->pid, __FUNCTION__); \
+            crServerDumpFilterOpLeave(CR_SERVER_DUMP_F_DRAW_LEAVE_ALL, cr_server.Recorder.pDumper); \
         } while (0)
 
@@ -616 +621 @@
             crServerDumpShader((_id)); \
             crDmpStrF(cr_server.Recorder.pDumper, "==Done[%d] %s==", (uint32_t)cr_server.curClient->pid, __FUNCTION__); \
+            crServerDumpFilterOpLeave(CR_SERVER_DUMP_F_COMPILE_SHADER, cr_server.Recorder.pDumper); \
         } while (0)
 
@@ -624 +630 @@
             crServerDumpShader((_id)); \
             crDmpStrF(cr_server.Recorder.pDumper, "==Done[%d] %s==", (uint32_t)cr_server.curClient->pid, __FUNCTION__); \
+            crServerDumpFilterOpLeave(CR_SERVER_DUMP_F_SHADER_SOURCE, cr_server.Recorder.pDumper); \
         } while (0)
 
@@ -632 +639 @@
             crServerDumpProgram((_id)); \
             crDmpStrF(cr_server.Recorder.pDumper, "==Done[%d] %s==", (uint32_t)cr_server.curClient->pid, __FUNCTION__); \
+            crServerDumpFilterOpLeave(CR_SERVER_DUMP_F_LINK_PROGRAM, cr_server.Recorder.pDumper); \
         } while (0)
 
@@ -641 +649 @@
             if (g_CrDbgDumpDrawFramesCount) { crServerDumpFramesCheck(); } \
             crDmpStrF(cr_server.Recorder.pDumper, "==Done ENTER[%d] %s==", (uint32_t)cr_server.curClient->pid, __FUNCTION__); \
+            crServerDumpFilterOpLeave(CR_SERVER_DUMP_F_SWAPBUFFERS_ENTER, cr_server.Recorder.pDumper); \
         } while (0)
 
@@ -648 +657 @@
             crDmpStrF(cr_server.Recorder.pDumper, "==[%d] %s==", (uint32_t)cr_server.curClient->pid, __FUNCTION__); \
             crServerDumpTexture((_pTex)); \
+            crServerDumpFilterOpLeave(CR_SERVER_DUMP_F_TEXPRESENT, cr_server.Recorder.pDumper); \
         } while (0)
 
@@ -655 +665 @@
             crServerDumpCheckInit(); \
             crDmpStrF(cr_server.Recorder.pDumper, "==Done LEAVE[%d] %s==", (uint32_t)cr_server.curClient->pid, __FUNCTION__); \
+            crServerDumpFilterOpLeave(CR_SERVER_DUMP_F_SWAPBUFFERS_LEAVE, cr_server.Recorder.pDumper); \
         } while (0)
 
@@ -662 +673 @@
         crDmpStrF(cr_server.Recorder.pDumper, "==[%d] %s==", (uint32_t)cr_server.curClient->pid, __FUNCTION__); \
         crServerDumpDrawel _msg; \
+        crServerDumpFilterOpLeave(CR_SERVER_DUMP_F_DRAWEL, cr_server.Recorder.pDumper); \
     } while (0)
 
@@ -669 +681 @@
         crDmpStrF(cr_server.Recorder.pDumper, "==[%d] %s==", (uint32_t)cr_server.curClient->pid, __FUNCTION__); \
         crServerDumpDrawelv((_index), (_pszElFormat), (_cbEl), (_pvVal), (_cVal)); \
+        crServerDumpFilterOpLeave(CR_SERVER_DUMP_F_DRAWEL, cr_server.Recorder.pDumper); \
     } while (0)
 #else /* if !defined VBOX_WITH_CRSERVER_DUMPER */

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

@@ -130 +130 @@
 
     case GL_GATHER_CONNECT_CR:
-        /* 
+        /*
          * We want the last connect to go through,
          * otherwise we might deadlock in CheckWindowSize()
@@ -136 +136 @@
          */
         gather_connect_count++;
-        if (cr_server.only_swap_once && (gather_connect_count != cr_server.numClients)) 
+        if (cr_server.only_swap_once && (gather_connect_count != cr_server.numClients))
         {
             break;
@@ -156 +156 @@
             const int eye = v[1] == 0.0 ? 0 : 1;
             crMatrixInitFromFloats(&cr_server.viewMatrix[eye], v + 2);
-            
-            crDebug("Got GL_SERVER_VIEW_MATRIX_CR:\n" 
+
+            crDebug("Got GL_SERVER_VIEW_MATRIX_CR:\n"
                             "  %f %f %f %f\n"
                             "  %f %f %f %f\n"
@@ -194 +194 @@
             const int eye = v[1] == 0.0 ? 0 : 1;
             crMatrixInitFromFloats(&cr_server.projectionMatrix[eye], v + 2);
-      
-            crDebug("Got GL_SERVER_PROJECTION_MATRIX_CR:\n" 
+
+            crDebug("Got GL_SERVER_PROJECTION_MATRIX_CR:\n"
                             "  %f %f %f %f\n"
                             "  %f %f %f %f\n"
@@ -230 +230 @@
                 float bottom = znear * (b - 1.0f) / y;
               float top = 2.0f * znear / y + bottom;
-              crDebug("Frustum: left, right, bottom, top, near, far: %f, %f, %f, %f, %f, %f", left, right, bottom, top, znear, zfar);   
+              crDebug("Frustum: left, right, bottom, top, near, far: %f, %f, %f, %f, %f, %f", left, right, bottom, top, znear, zfar);
             }
             else {
@@ -323 +323 @@
 
 
-void SERVER_DISPATCH_APIENTRY 
+void SERVER_DISPATCH_APIENTRY
 crServerDispatchCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
@@ -424 +424 @@
             gl->GenFramebuffersEXT(1, &fboID);
             gl->BindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboID);
-            gl->FramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, target, 
+            gl->FramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, target,
                                         ctx->texture.unit[ctx->texture.curTextureUnit].currentTexture2D->hwid, level);
             status = gl->CheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
@@ -492 +492 @@
                 gl->GetTexImage(target, level, GL_BGRA, GL_UNSIGNED_BYTE, img1);
 
-            
+
                 for (dRow=yoffset, sRow=y-height-1; dRow<yoffset-height; dRow++, sRow--)
                 {
@@ -879 +879 @@
 }
 
-void SERVER_DISPATCH_APIENTRY 
+void SERVER_DISPATCH_APIENTRY
 crServerDispatchBlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-                                   GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, 
+                                   GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
                                    GLbitfield mask, GLenum filter)
 {
@@ -1628 +1628 @@
 }
 
-bool crServerDumpFilterOp(unsigned long event, CR_DUMPER *pDumper)
+void crServerDumpFilterOpLeave(unsigned long event, CR_DUMPER *pDumper)
+{
+}
+
+bool crServerDumpFilterOpEnter(unsigned long event, CR_DUMPER *pDumper)
 {
     return CR_SERVER_DUMP_DEFAULT_FILTER_OP(event);