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

Timestamp:

Mar 15, 2013 5:42:49 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL/osx: fix null visible regions

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserverlib/server.h (modified) (1 diff)
• crserverlib/server_muralfbo.c (modified) (4 diffs)
• crserverlib/server_window.c (modified) (4 diffs)
• render/renderspu.c (modified) (1 diff)

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

@@ -142 +142 @@
 void crServerMuralFBOSwapBuffers(CRMuralInfo *mural);
 
-void crServerVBoxCompositionReenable(CRMuralInfo *mural);
+void crServerVBoxCompositionReenable(CRMuralInfo *mural, bool fOnContentHide);
 void crServerVBoxCompositionDisable(CRMuralInfo *mural);
-void crServerVBoxCompositionPresent(CRMuralInfo *mural);
+void crServerVBoxCompositionPresent(CRMuralInfo *mural, bool fOnContentHide);
 
 #define CR_SERVER_FBO_BB_IDX(_mural) ((_mural)->iBbBuffer)

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

@@ -513 +513 @@
 }
 
-void crServerVBoxCompositionPresent(CRMuralInfo *mural)
+void crServerVBoxCompositionPresent(CRMuralInfo *mural, bool fOnContentHide)
 {
     CRMuralInfo *currentMural = cr_server.currentMural;
@@ -522 +522 @@
     CRASSERT(curCtx == crStateGetCurrent());
 
-    if (!mural->bVisible)
-    {
-        return;
-    }
-
-    if (!mural->width || !mural->height)
-    {
-        return;
-    }
-
-    if (!CrVrScrCompositorEntryIsInList(&mural->CEntry))
-        return;
+    Assert(!CrVrScrCompositorIsEmpty(&mural->Compositor) == !fOnContentHide);
+
+    if (!fOnContentHide)
+    {
+        if (!mural->bVisible)
+        {
+            return;
+        }
+
+        if (!mural->width || !mural->height)
+        {
+            return;
+        }
+
+        if (!CrVrScrCompositorEntryIsInList(&mural->CEntry))
+            return;
+    }
 
     if (currentMural)
@@ -552 +557 @@
     crStateSwitchPostprocess(curCtx, NULL, idDrawFBO, idReadFBO);
 
-    mural->fCompositorPresented = GL_TRUE;
-}
-
-void crServerVBoxCompositionReenable(CRMuralInfo *mural)
+    mural->fCompositorPresented = !fOnContentHide;
+}
+
+void crServerVBoxCompositionReenable(CRMuralInfo *mural, bool fOnContentHide)
 {
     if (!mural->fCompositorPresented)
         return;
 
-    crServerVBoxCompositionPresent(mural);
+    crServerVBoxCompositionPresent(mural, fOnContentHide);
 }
 
@@ -595 +600 @@
     if (mural->fUseFBO == CR_SERVER_REDIR_FBO_BLT)
     {
-        crServerVBoxCompositionPresent(mural);
+        crServerVBoxCompositionPresent(mural, false);
         return;
     }

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

@@ -456 +456 @@
         if (mural->fUseFBO != CR_SERVER_REDIR_NONE)
         {
-            crServerVBoxCompositionReenable(mural);
+            crServerVBoxCompositionReenable(mural, false);
         }
     }
@@ -465 +465 @@
 {
     CRMuralInfo *mural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, window);
+    bool fContainedRegions;
     if (!mural) {
 #if EXTRA_WARN
@@ -486 +487 @@
     }
 
+    fContainedRegions = !CrVrScrCompositorIsEmpty(&mural->Compositor);
     /* 2. do necessary modifications (see above comment) */
     /* NOTE: we can do it even if mural->fUseFBO = CR_SERVER_REDIR_NONE to make sure the compositor data is always up to date */
@@ -523 +525 @@
     if (mural->fUseFBO != CR_SERVER_REDIR_NONE)
     {
-        crServerVBoxCompositionReenable(mural);
+        crServerVBoxCompositionReenable(mural, fContainedRegions && CrVrScrCompositorIsEmpty(&mural->Compositor));
     }
 }

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

@@ -644 +644 @@
     window = (WindowInfo *) crHashtableSearch(render_spu.windowTable, win);
     if (window) {
+#if !defined(RT_OS_DARWIN) || !defined(VBOX_WITH_COCOA_QT)
+        if (CrVrScrCompositorIsEmpty(pCompositor))
+            pCompositor = NULL;
+#endif
         renderspuVBoxCompositorSet( window, pCompositor);
         if (pCompositor)
         {
             renderspu_SystemVBoxPresentComposition(window, pCompositor, pChangedEntry);
+#if defined(RT_OS_DARWIN) && defined(VBOX_WITH_COCOA_QT)
+            if (CrVrScrCompositorIsEmpty(pCompositor))
+                renderspuVBoxCompositorSet( window, NULL);
+#endif
         }
     }