Changeset 45009 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c

Timestamp:

Mar 12, 2013 5:27:04 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: offscreen rendering & VRDP+3D-related fixes

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c (modified) (6 diffs)

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

@@ -265 +265 @@
         }
 
-        if (!crStateGetCurrent()->framebufferobject.drawFB)
-        {
-            cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, mural->aidFBOs[mural->iCurDrawBuffer]);
-        }
-        if (!crStateGetCurrent()->framebufferobject.readFB)
-        {
-            cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_READ_FRAMEBUFFER, mural->aidFBOs[mural->iCurReadBuffer]);
-        }
-
-        if (cr_server.curClient && cr_server.curClient->currentMural == mural)
-        {
+        if (cr_server.currentMural == mural)
+        {
+            if (!crStateGetCurrent()->framebufferobject.drawFB)
+            {
+                cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, mural->aidFBOs[mural->iCurDrawBuffer]);
+            }
+            if (!crStateGetCurrent()->framebufferobject.readFB)
+            {
+                cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_READ_FRAMEBUFFER, mural->aidFBOs[mural->iCurReadBuffer]);
+            }
+
             crStateGetCurrent()->buffer.width = 0;
             crStateGetCurrent()->buffer.height = 0;
@@ -286 +286 @@
             /* tell renderspu we do not want compositor presentation anymore
              * renderspu will ensure its redraw thread is done with using the compositor, etc. */
-            cr_server.head_spu->dispatch_table.VBoxPresentComposition(mural->spuWindow, NULL, NULL);
+            crServerVBoxCompositionDisable(mural);
         }
 
@@ -292 +292 @@
             cr_server.head_spu->dispatch_table.WindowShow(mural->spuWindow, mural->bVisible);
 
-        if (mural->fUseFBO && crServerSupportRedirMuralFBO())
+        if (cr_server.currentMural == mural)
         {
             if (!crStateGetCurrent()->framebufferobject.drawFB)
@@ -302 +302 @@
                 cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_READ_FRAMEBUFFER, 0);
             }
-        }
-
-        if (cr_server.curClient && cr_server.curClient->currentMural == mural)
-        {
+
             crStateGetCurrent()->buffer.width = mural->width;
             crStateGetCurrent()->buffer.height = mural->height;
@@ -512 +509 @@
 }
 
+void crServerVBoxCompositionPresent(CRMuralInfo *mural)
+{
+    CRMuralInfo *currentMural = cr_server.currentMural;
+    CRContextInfo *curCtxInfo = cr_server.currentCtxInfo;
+    GLuint idDrawFBO, idReadFBO;
+    CRContext *curCtx = curCtxInfo->pContext;
+
+    CRASSERT(curCtx == crStateGetCurrent());
+
+    if (!mural->bVisible)
+    {
+        return;
+    }
+
+    if (!mural->width || !mural->height)
+    {
+        return;
+    }
+
+    if (!CrVrScrCompositorEntryIsInList(&mural->CEntry))
+        return;
+
+    if (currentMural)
+    {
+        idDrawFBO = currentMural->aidFBOs[currentMural->iCurDrawBuffer];
+        idReadFBO = currentMural->aidFBOs[currentMural->iCurReadBuffer];
+    }
+    else
+    {
+        idDrawFBO = 0;
+        idReadFBO = 0;
+    }
+
+    crStateSwitchPrepare(NULL, curCtx, idDrawFBO, idReadFBO);
+
+    cr_server.head_spu->dispatch_table.VBoxPresentComposition(mural->spuWindow, &mural->Compositor, &mural->CEntry);
+
+    crStateSwitchPostprocess(curCtx, NULL, idDrawFBO, idReadFBO);
+
+    mural->fCompositorPresented = GL_TRUE;
+}
+
+void crServerVBoxCompositionReenable(CRMuralInfo *mural)
+{
+    if (!mural->fCompositorPresented)
+        return;
+
+    crServerVBoxCompositionPresent(mural);
+}
+
+void crServerVBoxCompositionDisable(CRMuralInfo *mural)
+{
+    cr_server.head_spu->dispatch_table.VBoxPresentComposition(mural->spuWindow, NULL, NULL);
+}
+
 void crServerPresentFBO(CRMuralInfo *mural)
 {
@@ -539 +591 @@
     if (mural->fUseFBO == CR_SERVER_REDIR_FBO_BLT)
     {
-        GLuint idDrawFBO, idReadFBO;
-
-        idDrawFBO = mural->aidFBOs[mural->iCurDrawBuffer];
-        idReadFBO = mural->aidFBOs[mural->iCurReadBuffer];
-
-        crStateSwitchPrepare(NULL, ctx, idDrawFBO, idReadFBO);
-
-        cr_server.head_spu->dispatch_table.VBoxPresentComposition(mural->spuWindow, &mural->Compositor, &mural->CEntry);
-
-        crStateSwitchPostprocess(ctx, NULL, idDrawFBO, idReadFBO);
-
+        crServerVBoxCompositionPresent(mural);
         return;
     }