Changeset 50184 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Jan 23, 2014 4:10:13 PM (11 years ago)

Author:

vboxsync

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

91753

Message:

crOpenGL: misc bugfixes, Vrdp+3D working with the new framework

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserverlib/server_misc.c (modified) (6 diffs)
• crserverlib/server_presenter.cpp (modified) (4 diffs)
• crserverlib/server_window.c (modified) (1 diff)
• render/renderspu.c (modified) (1 diff)

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

@@ -238 +238 @@
         }
         cr_server.projectionOverride = GL_TRUE;
+        break;
+
+    case GL_HH_SET_TMPCTX_MAKE_CURRENT:
+        /*we should not receive it from the guest! */
         break;
 
@@ -673 +677 @@
         Ctx.Base.id = cr_server.MainContextInfo.SpuContext;
         Ctx.Base.visualBits = cr_server.MainContextInfo.CreateInfo.visualBits;
-        rc = CrBltInit(&cr_server.Blitter, &Ctx, true, true, NULL, &cr_server.head_spu->dispatch_table);
+        rc = CrBltInit(&cr_server.Blitter, &Ctx, true, true, NULL, &cr_server.TmpCtxDispatch);
         if (RT_SUCCESS(rc))
         {
@@ -685 +689 @@
         }
     }
+
+    if (!CrBltMuralGetCurrentInfo(&cr_server.Blitter)->Base.id)
+    {
+        CRMuralInfo *dummy = crServerGetDummyMural(cr_server.MainContextInfo.CreateInfo.visualBits);
+        CR_BLITTER_WINDOW DummyInfo;
+        CRASSERT(dummy);
+        crServerVBoxBlitterWinInit(&DummyInfo, dummy);
+        CrBltMuralSetCurrentInfo(&cr_server.Blitter, &DummyInfo);
+    }
+
     return &cr_server.Blitter;
 }
@@ -1347 +1361 @@
     if (pCtx)
     {
-        GLint curSrvSpuCtx = cr_server.currentCtxInfo && cr_server.currentCtxInfo->SpuContext > 0 ? cr_server.currentCtxInfo->SpuContext : cr_server.MainContextInfo.SpuContext;
-        bool fSwitchToTmpCtx = (curSrvSpuCtx != context);
         CRMuralInfo *pCurrentMural = cr_server.currentMural;
-        CRContextInfo *pCurCtxInfo = cr_server.currentCtxInfo;
-        pCurCtx = pCurCtxInfo ? pCurCtxInfo->pContext : NULL;
-
-        CRASSERT(pCurCtx == pCtx);
+
+        pCurCtx = cr_server.currentCtxInfo ? cr_server.currentCtxInfo->pContext : cr_server.MainContextInfo.pContext;
+        Assert(pCurCtx == pCtx);
+
+        if (!context)
+        {
+            if (pCurrentMural)
+            {
+                Assert(cr_server.currentCtxInfo);
+                context = cr_server.currentCtxInfo->SpuContext > 0 ? cr_server.currentCtxInfo->SpuContext : cr_server.MainContextInfo.SpuContext;
+                window = pCurrentMural->spuWindow;
+            }
+            else
+            {
+                CRMuralInfo * pDummy;
+                Assert(!cr_server.currentCtxInfo);
+                pDummy = crServerGetDummyMural(cr_server.MainContextInfo.CreateInfo.visualBits);
+                context = cr_server.MainContextInfo.SpuContext;
+                window = pDummy->spuWindow;
+            }
+
+
+            fDoPrePostProcess = -1;
+        }
+        else
+        {
+            fDoPrePostProcess = 1;
+        }
 
         if (pCurrentMural)
@@ -1365 +1401 @@
             idReadFBO = 0;
         }
-
-        fDoPrePostProcess = fSwitchToTmpCtx ? 1 : -1;
     }
     else
@@ -1384 +1418 @@
 void crServerInitTmpCtxDispatch()
 {
+    MakeCurrentFunc_t pfnMakeCurrent;
+
     crSPUInitDispatchTable(&cr_server.TmpCtxDispatch);
     crSPUCopyDispatchTable(&cr_server.TmpCtxDispatch, &cr_server.head_spu->dispatch_table);
     cr_server.TmpCtxDispatch.MakeCurrent = crServerMakeTmpCtxCurrent;
+
+    pfnMakeCurrent = crServerMakeTmpCtxCurrent;
+    cr_server.head_spu->dispatch_table.ChromiumParametervCR(GL_HH_SET_TMPCTX_MAKE_CURRENT, GL_BYTE, sizeof (void*), &pfnMakeCurrent);
+
 }
 

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

@@ -330 +330 @@
     CRTextureObj *pTobj = pFbTex->pTobj;
 
-    CrTdBltDataCleanup(pTex);
+    CrTdBltDataCleanupNe(pTex);
 
     if (pTobj)
@@ -2433 +2433 @@
         }
 
-        return vrdpFrame(hNewEntry);
+        const VBOXVR_SCR_COMPOSITOR_ENTRY* pReplacedEntry = CrFbEntryGetCompositorEntry(hReplacedEntry);
+        CR_TEXDATA *pReplacedTex = CrVrScrCompositorEntryTexGet(pReplacedEntry);
+        const VBOXVR_SCR_COMPOSITOR_ENTRY* pNewEntry = CrFbEntryGetCompositorEntry(hNewEntry);
+        CR_TEXDATA *pNewTex = CrVrScrCompositorEntryTexGet(pNewEntry);
+
+        rc = CrTdBltEnter(pReplacedTex);
+        if (RT_SUCCESS(rc))
+        {
+            if (pNewTex != pReplacedTex)
+            {
+                CrTdBltDataDiscard(pReplacedTex);
+                rc = CrTdBltEnter(pNewTex);
+                if (RT_SUCCESS(rc))
+                {
+                    rc = vrdpFrame(hNewEntry);
+                    CrTdBltLeave(pNewTex);
+                }
+                else
+                    WARN(("CrTdBltEnter failed %d", rc));
+            }
+            else
+                rc = vrdpFrame(hNewEntry);
+
+            CrTdBltLeave(pReplacedTex);
+        }
+        else
+            WARN(("CrTdBltEnter failed %d", rc));
+
+        return rc;
     }
 
@@ -2445 +2473 @@
         }
 
-        return vrdpFrame(hEntry);
+        const VBOXVR_SCR_COMPOSITOR_ENTRY* pEntry = CrFbEntryGetCompositorEntry(hEntry);
+        CR_TEXDATA *pTex = CrVrScrCompositorEntryTexGet(pEntry);
+
+        rc = CrTdBltEnter(pTex);
+        if (RT_SUCCESS(rc))
+        {
+            rc = vrdpFrame(hEntry);
+            CrTdBltLeave(pTex);
+        }
+        else
+            WARN(("CrTdBltEnter failed %d", rc));
+
+        return rc;
     }
 
@@ -2597 +2637 @@
         CR_TEXDATA *pTex = CrVrScrCompositorEntryTexGet(pEntry);
         const CR_BLITTER_IMG *pImg;
+        CrTdBltDataDiscard(pTex);
         int rc = CrTdBltDataAcquire(pTex, GL_BGRA, !!(CrVrScrCompositorEntryFlagsGet(pEntry) & CRBLT_F_INVERT_SRC_YCOORDS), &pImg);
         if (!RT_SUCCESS(rc))

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

@@ -196 +196 @@
                 CR_BLITTER_WINDOW DummyInfo;
                 CRASSERT(dummy);
+                crServerVBoxBlitterWinInit(&DummyInfo, dummy);
                 CrBltMuralSetCurrentInfo(pBlitter, &DummyInfo);
         }

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c

@@ -1545 +1545 @@
                 memcpy(&render_spu.blitterDispatch.MakeCurrent, values, count);
         else
-                crWarning("unexpected type(%#x) - count(%d) pair", type, count);
+                WARN(("unexpected type(%#x) - count(%d) pair", type, count));
         break;
 
     default:
 #if 0
-        crWarning("Unhandled target in renderspuChromiumParametervCR(0x%x)", (int) target);
+        WARN(("Unhandled target in renderspuChromiumParametervCR(0x%x)", (int) target));
 #endif
         break;