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

Timestamp:

May 27, 2014 12:00:56 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: window visibility fix

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (modified) (5 diffs)

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

@@ -2325 +2325 @@
     }
 
-    bool IsCreated()
+    bool IsCreated() const
     {
         return !!mSpuWindow;
+    }
+
+    bool IsVisivle() const
+    {
+        return mFlags.fVisible;
     }
 
@@ -2852 +2857 @@
     int winVisibilityChanged()
     {
+        HCR_FRAMEBUFFER hFb = getFramebuffer();
+        if (!hFb || !CrFbIsEnabled(hFb))
+        {
+            Assert(!mpWindow->IsVisivle());
+            return VINF_SUCCESS;
+        }
+
         int rc = mpWindow->UpdateBegin();
         if (RT_SUCCESS(rc))
@@ -2905 +2917 @@
             setRegionsChanged();
 
-            return mpWindow->SetSize((uint32_t)(pRect->xRight - pRect->xLeft), (uint32_t)(pRect->yBottom - pRect->yTop));
+            rc = mpWindow->SetSize((uint32_t)(pRect->xRight - pRect->xLeft), (uint32_t)(pRect->yBottom - pRect->yTop));
+            if (!RT_SUCCESS(rc))
+            {
+                WARN(("SetSize failed rc %d", rc));
+                return rc;
+            }
+
+            rc = mpWindow->SetVisible(!g_CrPresenter.fWindowsForceHidden);
+            if (!RT_SUCCESS(rc))
+            {
+                WARN(("SetVisible failed rc %d", rc));
+                return rc;
+            }
+
+            return VINF_SUCCESS;
         }
 
@@ -2997 +3023 @@
         }
 
-        rc = mpWindow->SetVisible(!g_CrPresenter.fWindowsForceHidden);
+        HCR_FRAMEBUFFER hFb = getFramebuffer();
+        rc = mpWindow->SetVisible(hFb && CrFbIsEnabled(hFb) && !g_CrPresenter.fWindowsForceHidden);
         if (!RT_SUCCESS(rc))
         {
@@ -4637 +4664 @@
         CR_FBDISPLAY_INFO *pDpInfo = &g_CrPresenter.aDisplayInfos[i];
 
-        if (pDpInfo->iFb < 0)
-            continue;
-
         if (pDpInfo->pDpWin)
             pDpInfo->pDpWin->winVisibilityChanged();