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

Timestamp:

Apr 14, 2014 4:51:24 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: display 3D data properly on display enable or saved state load

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server.h (modified) (1 diff)
• server_presenter.cpp (modified) (6 diffs)

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

@@ -423 +423 @@
 
 
+int CrPMgrInit();
+void CrPMgrTerm();
 int CrPMgrDisable();
 int CrPMgrEnable();
-int CrPMgrInit();
-void CrPMgrTerm();
 
 typedef DECLCALLBACKPTR(bool, PFNCR_FRAMEBUFFER_ENTRIES_VISITOR_CB)(HCR_FRAMEBUFFER hFb, HCR_FRAMEBUFFER_ENTRY hEntry, void *pvContext);

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

@@ -2599 +2599 @@
     }
 
+    virtual int RegionsChanged(struct CR_FRAMEBUFFER *pFb)
+    {
+        int rc = CrFbDisplayBase::RegionsChanged(pFb);
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("err"));
+            return rc;
+        }
+
+        if (mpWindow->GetParentId())
+        {
+            rc = mpWindow->Create();
+            if (!RT_SUCCESS(rc))
+            {
+                WARN(("err"));
+                return rc;
+            }
+        }
+
+        return VINF_SUCCESS;
+    }
+
     virtual int EntryCreated(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hEntry)
     {
@@ -2938 +2960 @@
         }
 
-        mu32Screen = CrFbGetScreenInfo(getFramebuffer())->u32ViewIndex;
-
-        return windowSync();
+        HCR_FRAMEBUFFER hFb = getFramebuffer();
+
+        mu32Screen = CrFbGetScreenInfo(hFb)->u32ViewIndex;
+
+        rc = windowSync();
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("windowSync failed %d", rc));
+            return rc;
+        }
+
+        if (CrFbHas3DData(hFb))
+        {
+            if (mpWindow->GetParentId())
+            {
+                rc = mpWindow->Create();
+                if (!RT_SUCCESS(rc))
+                {
+                    WARN(("err"));
+                    return rc;
+                }
+            }
+        }
+
+        return VINF_SUCCESS;
     }
 
@@ -3646 +3690 @@
 }
 
-int crServerDisplaySaveState(PSSMHANDLE pSSM)
-{
-    int rc;
-    int cDisplays = 0, i;
-    for (i = 0; i < cr_server.screenCount; ++i)
-    {
-        if (ASMBitTest(cr_server.DisplaysInitMap, i) && !CrDpIsEmpty(&cr_server.aDispplays[i]))
-            ++cDisplays;
-    }
-
-    rc = SSMR3PutS32(pSSM, cDisplays);
-    AssertRCReturn(rc, rc);
-
-    if (!cDisplays)
-        return VINF_SUCCESS;
-
-    rc = SSMR3PutS32(pSSM, cr_server.screenCount);
-    AssertRCReturn(rc, rc);
-
-    for (i = 0; i < cr_server.screenCount; ++i)
-    {
-        rc = SSMR3PutS32(pSSM, cr_server.screen[i].x);
-        AssertRCReturn(rc, rc);
-
-        rc = SSMR3PutS32(pSSM, cr_server.screen[i].y);
-        AssertRCReturn(rc, rc);
-
-        rc = SSMR3PutU32(pSSM, cr_server.screen[i].w);
-        AssertRCReturn(rc, rc);
-
-        rc = SSMR3PutU32(pSSM, cr_server.screen[i].h);
-        AssertRCReturn(rc, rc);
-    }
-
-    for (i = 0; i < cr_server.screenCount; ++i)
-    {
-        if (ASMBitTest(cr_server.DisplaysInitMap, i) && !CrDpIsEmpty(&cr_server.aDispplays[i]))
-        {
-            rc = SSMR3PutS32(pSSM, i);
-            AssertRCReturn(rc, rc);
-
-            rc = CrDpSaveState(&cr_server.aDispplays[i], pSSM);
-            AssertRCReturn(rc, rc);
-        }
-    }
-
-    return VINF_SUCCESS;
-}
-
-int crServerDisplayLoadState(PSSMHANDLE pSSM, uint32_t u32Version)
-{
-
-}
 #endif
 
@@ -4247 +4238 @@
             hFb = CrPMgrFbGetNextEnabled(hFb))
     {
+        if (!CrFbHas3DData(hFb))
+            continue;
+
         uint32_t idScreen = CrFbGetScreenInfo(hFb)->u32ViewIndex;
         CR_FBDISPLAY_INFO *pInfo = &g_CrPresenter.aDisplayInfos[idScreen];
@@ -4528 +4522 @@
 int CrFbLoadState(CR_FRAMEBUFFER *pFb, PSSMHANDLE pSSM, uint32_t version)
 {
+    Assert(0);
     uint32_t u32 = 0;
     int rc = SSMR3GetU32(pSSM, &u32);
@@ -4542 +4537 @@
         rc = CrFbEntryLoadState(pFb, pSSM, version);
         AssertRCReturn(rc, rc);
-
     }