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

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server.h (modified) (1 diff)
• server_context.c (modified) (1 diff)
• server_muralfbo.c (modified) (6 diffs)
• server_window.c (modified) (10 diffs)

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

@@ -142 +142 @@
 void crServerMuralFBOSwapBuffers(CRMuralInfo *mural);
 
+void crServerVBoxCompositionReenable(CRMuralInfo *mural);
+void crServerVBoxCompositionDisable(CRMuralInfo *mural);
+void crServerVBoxCompositionPresent(CRMuralInfo *mural);
+
 #define CR_SERVER_FBO_BB_IDX(_mural) ((_mural)->iBbBuffer)
 #define CR_SERVER_FBO_FB_IDX(_mural) (((_mural)->iBbBuffer + 1) % ((_mural)->cBuffers))

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

@@ -287 +287 @@
     CRASSERT(ctx);
 
-    oldMural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, cr_server.currentWindow);
+    oldMural = cr_server.currentMural;
 
     /* Ubuntu 11.04 hosts misbehave if context window switch is

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

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

@@ -31 +31 @@
         return -1;
     }
+
+    mural->fCompositorPresented = GL_FALSE;
 
     /*
@@ -339 +341 @@
 
             /* 1. tell renderspu to stop using the current compositor (see above comment) */
-            cr_server.head_spu->dispatch_table.VBoxPresentComposition(mural->spuWindow, NULL, NULL);
-        }
+            crServerVBoxCompositionDisable(mural);
+        }
+
+        mural->fCompositorPresented = GL_FALSE;
 
         /* 2. do necessary modifications (see above comment) */
@@ -359 +363 @@
         mural->height = height;
 
-        if (cr_server.curClient && cr_server.curClient->currentMural == mural)
+        if (cr_server.currentMural == mural)
         {
             crStateGetCurrent()->buffer.width = mural->width;
@@ -370 +374 @@
 
         /* 3. (so far not needed for resize, but in case it is in the future) re-set the compositor (see above comment) */
-        /*
+        /* uncomment when needed */
+        /* NOTE: !!! we have mural->fCompositorPresented set to GL_FALSE above, so crServerVBoxCompositionReenable will have no effect in any way
         if (mural->fUseFBO != CR_SERVER_REDIR_NONE)
         {
-            cr_server.head_spu->dispatch_table.VBoxPresentComposition(mural->spuWindow, &mural->Compositor, &mural->CEntry);
+            crServerVBoxCompositionReenable(mural);
         }
         */
@@ -395 +400 @@
     crServerMuralSize(mural, width, height);
 
-    /* Work-around Intel driver bug */
-    CRASSERT(!cr_server.curClient
-            || !cr_server.curClient->currentMural
-            || cr_server.curClient->currentMural == mural);
-    if (cr_server.curClient && cr_server.curClient->currentMural == mural)
-    {
-        CRContextInfo * ctxInfo = cr_server.currentCtxInfo;
-        CRASSERT(ctxInfo);
-        crServerDispatchMakeCurrent(window, 0, ctxInfo->CreateInfo.externalID);
+    if (cr_server.currentMural == mural)
+    {
+        crServerPerformMakeCurrent( mural, cr_server.currentCtxInfo );
     }
 }
@@ -433 +432 @@
 
             /* 1. tell renderspu to stop using the current compositor (see above comment) */
-            cr_server.head_spu->dispatch_table.VBoxPresentComposition(mural->spuWindow, NULL, NULL);
+            crServerVBoxCompositionDisable(mural);
         }
 
@@ -443 +442 @@
         /* the compositor lock is not needed actually since we have prevented renderspu from using the compositor */
         /* CrVrScrCompositorLock(&mural->Compositor); */
-        CrVrScrCompositorEntryPosSet(&mural->Compositor, &mural->CEntry, &Pos);
+        /* no need to set position because the position is relative to window */
+        /*CrVrScrCompositorEntryPosSet(&mural->Compositor, &mural->CEntry, &Pos);*/
         /*CrVrScrCompositorUnlock(&mural->Compositor);*/
 
@@ -454 +454 @@
         if (mural->fUseFBO != CR_SERVER_REDIR_NONE)
         {
-            cr_server.head_spu->dispatch_table.VBoxPresentComposition(mural->spuWindow, &mural->Compositor, &mural->CEntry);
+            crServerVBoxCompositionReenable(mural);
         }
     }
@@ -481 +481 @@
 
         /* 1. tell renderspu to stop using the current compositor (see above comment) */
-        cr_server.head_spu->dispatch_table.VBoxPresentComposition(mural->spuWindow, NULL, NULL);
+        crServerVBoxCompositionDisable(mural);
     }
 
@@ -521 +521 @@
     if (mural->fUseFBO != CR_SERVER_REDIR_NONE)
     {
-        cr_server.head_spu->dispatch_table.VBoxPresentComposition(mural->spuWindow, &mural->Compositor, &mural->CEntry);
+        crServerVBoxCompositionReenable(mural);
     }
 }