Changeset 50280 in vbox for trunk

Timestamp:

Jan 30, 2014 7:57:02 AM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: init/cleanup fixes

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

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

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

@@ -414 +414 @@
 void CrPMgrTerm();
 
+typedef DECLCALLBACKPTR(bool, PFNCR_FRAMEBUFFER_ENTRIES_VISITOR_CB)(HCR_FRAMEBUFFER hFb, HCR_FRAMEBUFFER_ENTRY hEntry, void *pvContext);
+
+void CrFbVisitCreatedEntries(HCR_FRAMEBUFFER hFb, PFNCR_FRAMEBUFFER_ENTRIES_VISITOR_CB pfnVisitorCb, void *pvContext);
 int CrFbResize(HCR_FRAMEBUFFER hFb, const struct VBVAINFOSCREEN * pScreen, void *pvVRAM);
 bool CrFbIsEnabled(HCR_FRAMEBUFFER hFb);

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

@@ -807 +807 @@
 }
 
+void CrFbVisitCreatedEntries(HCR_FRAMEBUFFER hFb, PFNCR_FRAMEBUFFER_ENTRIES_VISITOR_CB pfnVisitorCb, void *pvContext)
+{
+    HCR_FRAMEBUFFER_ENTRY hEntry, hNext;
+    RTListForEachSafe(&hFb->EntriesList, hEntry, hNext, CR_FRAMEBUFFER_ENTRY, Node)
+    {
+        if (hEntry->Flags.fCreateNotified)
+        {
+            if (!pfnVisitorCb(hFb, hEntry, pvContext))
+                return;
+        }
+    }
+}
+
+
 CRHTABLE_HANDLE CrFbDDataAllocSlot(CR_FRAMEBUFFER *pFb)
 {
@@ -815 +829 @@
 {
     HCR_FRAMEBUFFER_ENTRY hEntry, hNext;
-    RTListForEachSafeCpp(&pFb->EntriesList, hEntry, hNext, CR_FRAMEBUFFER_ENTRY, Node)
+    RTListForEachSafe(&pFb->EntriesList, hEntry, hNext, CR_FRAMEBUFFER_ENTRY, Node)
     {
         if (CrFbDDataEntryGet(hEntry, hSlot))
         {
-            pfnReleaseCb(pFb, hEntry, pvContext);
+            if (pfnReleaseCb)
+                pfnReleaseCb(pFb, hEntry, pvContext);
+
             CrFbDDataEntryClear(hEntry, hSlot);
         }
@@ -1070 +1086 @@
     }
 
+    static DECLCALLBACK(bool) entriesCreateCb(HCR_FRAMEBUFFER hFb, HCR_FRAMEBUFFER_ENTRY hEntry, void *pvContext)
+    {
+        int rc = ((ICrFbDisplay*)(pvContext))->EntryCreated(hFb, hEntry);
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("err"));
+        }
+        return true;
+    }
+
+    static DECLCALLBACK(bool) entriesDestroyCb(HCR_FRAMEBUFFER hFb, HCR_FRAMEBUFFER_ENTRY hEntry, void *pvContext)
+    {
+        int rc = ((ICrFbDisplay*)(pvContext))->EntryDestroyed(hFb, hEntry);
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("err"));
+        }
+        return true;
+    }
+
     int fbSynchAddAllEntries()
     {
@@ -1079 +1115 @@
         int rc = VINF_SUCCESS;
 
+        CrFbVisitCreatedEntries(mpFb, entriesCreateCb, this);
+
         while ((pEntry = CrVrScrCompositorConstIterNext(&Iter)) != NULL)
         {
             HCR_FRAMEBUFFER_ENTRY hEntry = CrFbEntryFromCompositorEntry(pEntry);
-            rc = EntryCreated(mpFb, hEntry);
-            if (!RT_SUCCESS(rc))
-            {
-                WARN(("err"));
-                break;
-            }
 
             rc = EntryAdded(mpFb, hEntry);
@@ -1101 +1133 @@
     }
 
-    int fbCleanupRemoveAllEntries(bool fNotifyDestroy)
+    int fbCleanupRemoveAllEntries()
     {
         VBOXVR_SCR_COMPOSITOR_CONST_ITERATOR Iter;
@@ -1120 +1152 @@
             }
 
-            if (fNotifyDestroy)
-            {
-                rc = EntryDestroyed(mpFb, hEntry);
-                if (!RT_SUCCESS(rc))
-                {
-                    WARN(("err"));
-                    break;
-                }
-            }
+            CrFbVisitCreatedEntries(mpFb, entriesDestroyCb, this);
         }
 
@@ -1145 +1169 @@
     static DECLCALLBACK(void) slotEntryReleaseCB(HCR_FRAMEBUFFER hFb, HCR_FRAMEBUFFER_ENTRY hEntry, void *pvContext)
     {
-        ((ICrFbDisplay*)pvContext)->EntryDestroyed(hFb, hEntry);
     }
 
@@ -2477 +2500 @@
     virtual int clearCompositor()
     {
-        return fbCleanupRemoveAllEntries(false);
+        return fbCleanupRemoveAllEntries();
     }
 
@@ -2682 +2705 @@
     virtual int fbCleanup()
     {
-        int rc = fbCleanupRemoveAllEntries(false);
+        int rc = fbCleanupRemoveAllEntries();
         if (!RT_SUCCESS(rc))
         {