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

Timestamp:

Aug 13, 2014 3:08:02 PM (11 years ago)

Author:

vboxsync

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

95508

Message:

crOpenGL: fix white window on fullscreen enter

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (modified) (14 diffs)
• src/VBox/HostServices/SharedOpenGL/render/renderspu.c (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m (modified) (3 diffs)

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

@@ -2359 +2359 @@
 
             if (parentId)
-                cr_server.head_spu->dispatch_table.WindowPosition(mSpuWindow, mxPos, myPos);
-
-            if (!oldParentId && parentId && mFlags.fVisible)
-                cr_server.head_spu->dispatch_table.WindowShow(mSpuWindow, true);
+            {
+                if (mFlags.fVisible)
+                    cr_server.head_spu->dispatch_table.WindowPosition(mSpuWindow, mxPos, myPos);
+                cr_server.head_spu->dispatch_table.WindowShow(mSpuWindow, mFlags.fVisible);
+            }
         }
 
@@ -2382 +2383 @@
             mFlags.fVisible = fVisible;
             if (mSpuWindow && mParentId)
+            {
+                if (fVisible)
+                    cr_server.head_spu->dispatch_table.WindowPosition(mSpuWindow, mxPos, myPos);
                 cr_server.head_spu->dispatch_table.WindowShow(mSpuWindow, fVisible);
+            }
         }
 
@@ -2627 +2632 @@
 {
 public:
-    CrFbDisplayWindow(CrFbWindow *pWindow, const RTRECT *pViewportRect) :
-        mpWindow(pWindow),
+    CrFbDisplayWindow(const RTRECT *pViewportRect, uint64_t parentId, uint64_t defaultParentId) :
+        mpWindow(NULL),
         mViewportRect(*pViewportRect),
-        mu32Screen(~0)
+        mu32Screen(~0),
+        mParentId(parentId),
+        mDefaultParentId(defaultParentId)
     {
         mFlags.u32Value = 0;
-        CRASSERT(pWindow);
     }
 
@@ -2832 +2838 @@
     }
 
+    virtual int setDefaultParent(uint64_t parentId)
+    {
+        mDefaultParentId = parentId;
+
+        if (!isActive())
+        {
+            int rc = mpWindow->Reparent(parentId);
+            if (!RT_SUCCESS(rc))
+            {
+                WARN(("window reparent failed"));
+                return rc;
+            }
+        }
+
+        return VINF_SUCCESS;
+    }
+
     virtual int reparent(uint64_t parentId)
     {
@@ -2840 +2863 @@
         }
 
-        int rc = mpWindow->Reparent(parentId);
-        if (!RT_SUCCESS(rc))
-            WARN(("window reparent failed"));
-
-        mFlags.fNeForce = 1;
+        mParentId = parentId;
+        int rc = VINF_SUCCESS;
+
+        if (isActive())
+        {
+            rc = mpWindow->Reparent(parentId);
+            if (!RT_SUCCESS(rc))
+                WARN(("window reparent failed"));
+
+            mFlags.fNeForce = 1;
+        }
 
         return rc;
@@ -2969 +2998 @@
     }
 
+    bool isActive()
+    {
+        HCR_FRAMEBUFFER hFb = getFramebuffer();
+        return hFb && CrFbIsEnabled(hFb);
+    }
+
     int windowDimensionsSync(bool fForceCleanup = false)
     {
         int rc = VINF_SUCCESS;
 
-        HCR_FRAMEBUFFER hFb = getFramebuffer();
-        if (!fForceCleanup && hFb && CrFbIsEnabled(hFb))
+//        HCR_FRAMEBUFFER hFb = getFramebuffer();
+        if (!fForceCleanup && isActive())
         {
             const RTRECT* pRect = getRect();
+
+            if (mpWindow->GetParentId() != mParentId)
+            {
+                rc = mpWindow->Reparent(mParentId);
+                if (!RT_SUCCESS(rc))
+                {
+                    WARN(("err"));
+                    return rc;
+                }
+            }
 
             rc = mpWindow->SetPosition(pRect->xLeft - mViewportRect.xLeft, pRect->yTop - mViewportRect.yTop);
@@ -3004 +3049 @@
         {
             rc = mpWindow->SetVisible(false);
+            if (!RT_SUCCESS(rc))
+            {
+                WARN(("err"));
+                return rc;
+            }
+
+            rc = mpWindow->Reparent(mDefaultParentId);
             if (!RT_SUCCESS(rc))
             {
@@ -3092 +3144 @@
     CR_FBDISPWINDOW_FLAGS mFlags;
     uint32_t mu32Screen;
+    uint64_t mParentId;
+    uint64_t mDefaultParentId;
 };
 
@@ -3097 +3151 @@
 {
 public:
-    CrFbDisplayWindowRootVr(CrFbWindow *pWindow, const RTRECT *pViewportRect) :
-        CrFbDisplayWindow(pWindow, pViewportRect)
+    CrFbDisplayWindowRootVr(const RTRECT *pViewportRect, uint64_t parentId, uint64_t defaultParentId) :
+        CrFbDisplayWindow(pViewportRect, parentId, defaultParentId)
     {
         CrVrScrCompositorInit(&mCompositor, NULL);
@@ -4114 +4168 @@
     }
 
-    CR_FBDISPLAY_INFO *pDpInfo = &g_CrPresenter.aDisplayInfos[idScreen];
+    int rc = VINF_SUCCESS;
+    CR_FBDISPLAY_INFO *pDpInfo;
+    bool fDefaultParentChange = (idScreen == 0);
+    if (fDefaultParentChange)
+    {
+        for (int i = 0; i < cr_server.screenCount; ++i)
+        {
+            pDpInfo = &g_CrPresenter.aDisplayInfos[i];
+            if (pDpInfo->pDpWin)
+            {
+                HCR_FRAMEBUFFER hFb = pDpInfo->iFb >= 0 ? CrPMgrFbGet(pDpInfo->iFb) : NULL;
+                rc = pDpInfo->pDpWin->UpdateBegin(hFb);
+                if (RT_SUCCESS(rc))
+                {
+                    rc = pDpInfo->pDpWin->setDefaultParent(cr_server.screen[idScreen].winID);
+                    if (RT_FAILURE(rc))
+                    {
+                        WARN(("setDefaultParent failed %d", rc));
+                        pDpInfo->pDpWin->UpdateEnd(hFb);
+                    }
+                }
+                else
+                    WARN(("UpdateBegin failed %d", rc));
+
+                if (RT_FAILURE(rc))
+                {
+                    WARN(("err"));
+                    for (int j = 0; j < i - 1; ++j)
+                    {
+                        pDpInfo = &g_CrPresenter.aDisplayInfos[j];
+                        if (pDpInfo->pDpWin)
+                        {
+                            HCR_FRAMEBUFFER hFb = pDpInfo->iFb >= 0 ? CrPMgrFbGet(pDpInfo->iFb) : NULL;
+                            pDpInfo->pDpWin->UpdateEnd(hFb);
+                        }
+                    }
+
+                    Assert(RT_FAILURE(rc));
+                    return rc;
+                }
+            }
+        }
+    }
+
+    pDpInfo = &g_CrPresenter.aDisplayInfos[idScreen];
     if (pDpInfo->pDpWin)
     {
@@ -4121 +4219 @@
         {
             WARN(("trying to update viewport while framebuffer is being updated"));
-            return VERR_INVALID_STATE;
-        }
-
-        int rc = pDpInfo->pDpWin->UpdateBegin(hFb);
+            rc = VERR_INVALID_STATE;
+            goto end;
+        }
+
+        rc = pDpInfo->pDpWin->UpdateBegin(hFb);
         if (RT_SUCCESS(rc))
         {
@@ -4135 +4234 @@
     }
 
-    return VINF_SUCCESS;
+end:
+
+    if (fDefaultParentChange)
+    {
+        for (int i = 0; i < cr_server.screenCount; ++i)
+        {
+            pDpInfo = &g_CrPresenter.aDisplayInfos[i];
+            if (pDpInfo->pDpWin)
+            {
+                HCR_FRAMEBUFFER hFb = pDpInfo->iFb >= 0 ? CrPMgrFbGet(pDpInfo->iFb) : NULL;
+                pDpInfo->pDpWin->UpdateEnd(hFb);
+            }
+        }
+    }
+
+    return rc;
 }
 
@@ -4316 +4430 @@
         }
         else
-            pWin = new CrFbWindow(cr_server.screen[pDpInfo->u32Id].winID);
-
-        pDpInfo->pDpWinRootVr = new CrFbDisplayWindowRootVr(pWin, &cr_server.screenVieport[pDpInfo->u32Id].Rect);
+            pWin = new CrFbWindow(0);
+
+        pDpInfo->pDpWinRootVr = new CrFbDisplayWindowRootVr(&cr_server.screenVieport[pDpInfo->u32Id].Rect, cr_server.screen[pDpInfo->u32Id].winID, cr_server.screen[0].winID);
         pDpInfo->pDpWin = pDpInfo->pDpWinRootVr;
+        pDpInfo->pDpWinRootVr->windowAttach(pWin);
     }
 }
@@ -4339 +4454 @@
     {
         if (!pWin)
-            pWin = new CrFbWindow(cr_server.screen[pDpInfo->u32Id].winID);
-
-        pDpInfo->pDpWin = new CrFbDisplayWindow(pWin, &cr_server.screenVieport[pDpInfo->u32Id].Rect);
+            pWin = new CrFbWindow(0);
+
+        pDpInfo->pDpWin = new CrFbDisplayWindow(&cr_server.screenVieport[pDpInfo->u32Id].Rect, cr_server.screen[pDpInfo->u32Id].winID, cr_server.screen[0].winID);
+        pDpInfo->pDpWin->windowAttach(pWin);
     }
 }

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

@@ -758 +758 @@
         visible = !!flag;
         
-        if (window->visible != visible)
+//        if (window->visible != visible)
         {
             renderspu_SystemShowWindow( window, visible );

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m

@@ -376 +376 @@
 - (void)makeCurrentFBO;
 - (void)swapFBO;
+- (void)vboxSubmitVisible:(GLboolean)fVisible;
+- (void)vboxSetVisibleUI;
+- (void)vboxSetHiddenUI;
 - (void)vboxTryDraw;
 - (void)vboxTryDrawUI;
@@ -1179 +1182 @@
     /* issue to the gui thread */
     [self setNeedsDisplay:YES];
+}
+
+- (void)vboxSubmitVisible:(GLboolean)fVisible
+{
+    if (fVisible)
+        [self performSelectorOnMainThread:@selector(vboxSetVisibleUI) withObject:nil waitUntilDone:NO];
+    else
+        [self performSelectorOnMainThread:@selector(vboxSetHiddenUI) withObject:nil waitUntilDone:NO];
+}
+
+- (void)vboxSetVisibleUI
+{
+    [self setHidden: NO];
+}
+
+- (void)vboxSetHiddenUI
+{
+    [self setHidden: YES];
 }
 
@@ -1853 +1874 @@
     NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
 
-    [pView setHidden: fShowIt==GL_TRUE?NO:YES];
+    [pView vboxSubmitVisible:fShowIt];
 
     [pPool release];