Changeset 53158 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/server_presenter.cpp

Timestamp:

Oct 28, 2014 12:09:57 PM (10 years ago)

Author:

vboxsync

Message:

Host 3D: Presentation framework: start dropping goto's.

File:

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

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

@@ -1838 +1838 @@
 
     int rc = VINF_SUCCESS;
-    CR_FBDISPLAY_INFO *pDpInfo;
-#if 0
-    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;
-                }
-            }
-        }
-    }
-#endif
-
-    pDpInfo = &g_CrPresenter.aDisplayInfos[idScreen];
-
-    HCR_FRAMEBUFFER hFb = pDpInfo->iFb >= 0 ? CrPMgrFbGet(pDpInfo->iFb) : NULL;
+
+    CR_FBDISPLAY_INFO *pDpInfo = &g_CrPresenter.aDisplayInfos[idScreen];
+    HCR_FRAMEBUFFER    hFb     = pDpInfo->iFb >= 0 ? CrPMgrFbGet(pDpInfo->iFb) : NULL;
+
     if (hFb && CrFbIsUpdating(hFb))
     {
         WARN(("trying to update viewport while framebuffer is being updated"));
-        rc = VERR_INVALID_STATE;
-        goto end;
+        return VERR_INVALID_STATE;
     }
 
@@ -1901 +1856 @@
         {
             pDpInfo->pDpWin->reparent(cr_server.screen[idScreen].winID);
-
             pDpInfo->pDpWin->UpdateEnd(hFb);
         }
-        else
-            WARN(("UpdateBegin failed %d", rc));
     }
     else
@@ -1912 +1864 @@
         {
             rc = pDpInfo->pWindow->UpdateBegin();
-            if (RT_FAILURE(rc))
-            {
-                WARN(("UpdateBegin failed %d", rc));
-                goto end;
-            }
-
-            rc = pDpInfo->pWindow->SetVisible(false);
-            if (RT_FAILURE(rc))
-            {
-                WARN(("SetVisible failed %d", rc));
+            if (RT_SUCCESS(rc))
+            {
+                rc = pDpInfo->pWindow->SetVisible(false);
+                if (RT_SUCCESS(rc))
+                    rc = pDpInfo->pWindow->Reparent(cr_server.screen[idScreen].winID);
+
                 pDpInfo->pWindow->UpdateEnd();
-                goto end;
-            }
-
-            rc = pDpInfo->pWindow->Reparent(cr_server.screen[idScreen].winID);
-            if (RT_FAILURE(rc))
-            {
-                WARN(("Reparent failed %d", rc));
-                pDpInfo->pWindow->UpdateEnd();
-                goto end;
-            }
-
-            pDpInfo->pWindow->UpdateEnd();
-        }
-
-        rc = crPMgrCheckInitWindowDisplays(idScreen);
-        if (RT_FAILURE(rc))
-        {
-            WARN(("crPMgrFbConnectTargetDisplays failed %d", rc));
-            goto end;
-        }
-    }
-end:
-#if 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;
-                pDpInfo->pDpWin->UpdateEnd(hFb);
-            }
-        }
-    }
-#endif
+            }
+        }
+
+        if (RT_SUCCESS(rc))
+            rc = crPMgrCheckInitWindowDisplays(idScreen);
+    }
+
+    CRASSERT(!rc);
+
     return rc;
 }