Changeset 50095 in vbox for trunk/src/VBox/GuestHost/OpenGL/state_tracker

Timestamp:

Jan 17, 2014 4:34:07 PM (11 years ago)

Author:

vboxsync

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

91620

Message:

crOpenGL: presentation infrastructure rework (still work in progress)

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/dump.cpp (modified) (8 diffs)

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

@@ -337 +337 @@
 }
 
-void crRecDumpBuffer(CR_RECORDER *pRec, CRContext *ctx, CR_BLITTER_CONTEXT *pCurCtx, CR_BLITTER_WINDOW *pCurWin, GLint idRedirFBO, VBOXVR_TEXTURE *pRedirTex)
+void crRecDumpBuffer(CR_RECORDER *pRec, CRContext *ctx, GLint idRedirFBO, VBOXVR_TEXTURE *pRedirTex)
 {
     GLenum texTarget = 0;
@@ -412 +412 @@
         pTl = &pTobj->level[0][hwTexLevel];
 
-        rc = CrBltEnter(pRec->pBlitter, pCurCtx, pCurWin);
+        rc = CrBltEnter(pRec->pBlitter);
         if (!RT_SUCCESS(rc))
         {
@@ -447 +447 @@
         height = pRedirTex->height;
 
-        rc = CrBltEnter(pRec->pBlitter, pCurCtx, pCurWin);
+        rc = CrBltEnter(pRec->pBlitter);
         if (!RT_SUCCESS(rc))
         {
@@ -1338 +1338 @@
 }
 
-void crRecDumpTextureV(CR_RECORDER *pRec, const VBOXVR_TEXTURE *pTex, CR_BLITTER_CONTEXT *pCurCtx, CR_BLITTER_WINDOW *pCurWin, const char *pszStr, va_list pArgList)
+void crRecDumpTextureV(CR_RECORDER *pRec, const VBOXVR_TEXTURE *pTex, const char *pszStr, va_list pArgList)
 {
     CR_BLITTER_IMG Img = {0};
-    int rc = CrBltEnter(pRec->pBlitter, pCurCtx, pCurWin);
+    int rc = CrBltEnter(pRec->pBlitter);
     if (RT_SUCCESS(rc))
     {
@@ -1376 +1376 @@
 }
 
-void crRecDumpTextureF(CR_RECORDER *pRec, const VBOXVR_TEXTURE *pTex, CR_BLITTER_CONTEXT *pCurCtx, CR_BLITTER_WINDOW *pCurWin, const char *pszStr, ...)
+void crRecDumpTextureF(CR_RECORDER *pRec, const VBOXVR_TEXTURE *pTex, const char *pszStr, ...)
 {
     va_list pArgList;
     va_start(pArgList, pszStr);
-    crRecDumpTextureV(pRec, pTex, pCurCtx, pCurWin, pszStr, pArgList);
+    crRecDumpTextureV(pRec, pTex, 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)
+void crRecDumpTextureByIdV(CR_RECORDER *pRec, CRContext *ctx, GLint id, const char *pszStr, va_list pArgList)
 {
     CRTextureObj *pTobj = (CRTextureObj *)crHashtableSearch(ctx->shared->textureTable, id);
@@ -1406 +1406 @@
     }
 
-    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, ...)
+    crRecDumpTextureV(pRec, &Tex, pszStr, pArgList);
+}
+
+void crRecDumpTextureByIdF(CR_RECORDER *pRec, CRContext *ctx, GLint id, const char *pszStr, ...)
 {
     va_list pArgList;
     va_start(pArgList, pszStr);
-    crRecDumpTextureByIdV(pRec, ctx, id, pCurCtx, pCurWin, pszStr, pArgList);
+    crRecDumpTextureByIdV(pRec, ctx, id, pszStr, pArgList);
     va_end(pArgList);
 }
 
-void crRecDumpTextures(CR_RECORDER *pRec, CRContext *ctx, CR_BLITTER_CONTEXT *pCurCtx, CR_BLITTER_WINDOW *pCurWin)
+void crRecDumpTextures(CR_RECORDER *pRec, CRContext *ctx)
 {
     GLint maxUnits = 0;
@@ -1510 +1510 @@
                 }
 
-                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);
+                crRecDumpTextureF(pRec, &Tex, "ctx(%d), Unit %d: TEXTURE_2D id(%d) hwid(%d), width(%d), height(%d)", ctx, i, pTobj->id, pTobj->hwid, width, height);
             }
 //            else
@@ -1558 +1558 @@
                 Tex.hwid = hwTex;
 
-                rc = CrBltEnter(pRec->pBlitter, pCurCtx, pCurWin);
+                rc = CrBltEnter(pRec->pBlitter);
                 if (RT_SUCCESS(rc))
                 {