Changeset 47577 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Timestamp:

Aug 7, 2013 10:13:47 AM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: postpone event notification until data is presented (needed for OSX hosts)

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server.h (modified) (1 diff)
• server_config.c (modified) (1 diff)
• server_main.c (modified) (1 diff)
• server_muralfbo.c (modified) (2 diffs)
• server_window.c (modified) (1 diff)

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

@@ -134 +134 @@
 
 void crVBoxServerNotifyEvent(int32_t idScreen, uint32_t uEvent, void*pvData);
+void crVBoxServerCheckVisibilityEvent(int32_t idScreen);
+
 void crServerDisplayTermAll();
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_config.c

@@ -59 +59 @@
     cr_server.bWindowsInitiallyHidden = GL_FALSE;
 
-    memset(cr_server.acVisibleWindows, 0, sizeof (cr_server.acVisibleWindows));
+    cr_server.cDisableEvents = 0;
+    memset(cr_server.aWinVisibilityInfos, 0, sizeof (cr_server.aWinVisibilityInfos));
 
     cr_server.pfnNotifyEventCB = NULL;

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -2666 +2666 @@
 }
 
+void crVBoxServerCheckVisibilityEvent(int32_t idScreen)
+{
+    if (cr_server.cDisableEvents)
+        return;
+
+    if (idScreen < 0)
+    {
+        int32_t i = 0;
+        for (; i < cr_server.screenCount; ++i)
+        {
+            crVBoxServerCheckVisibilityEvent(i);
+        }
+        return;
+    }
+
+    CRASSERT(idScreen < cr_server.screenCount);
+
+    if (!cr_server.aWinVisibilityInfos[idScreen].cVisibleWindows == !cr_server.aWinVisibilityInfos[idScreen].fLastReportedVisible)
+        return;
+
+    crVBoxServerNotifyEvent(idScreen, VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_3DDATA,
+            cr_server.aWinVisibilityInfos[idScreen].cVisibleWindows ? (void*)1 : NULL);
+
+    cr_server.aWinVisibilityInfos[idScreen].fLastReportedVisible = cr_server.aWinVisibilityInfos[idScreen].cVisibleWindows ? 1 : 0;
+}
+
 static void crVBoxServerReparentMuralCB(unsigned long key, void *data1, void *data2)
 {

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c

@@ -749 +749 @@
 void crServerVBoxCompositionDisableEnter(CRMuralInfo *mural)
 {
+    ++cr_server.cDisableEvents;
+    Assert(cr_server.cDisableEvents);
+
     ++mural->cDisabled;
     Assert(mural->cDisabled);
@@ -767 +770 @@
         mural->fForcePresentState = GL_FALSE;
     }
+
+    --cr_server.cDisableEvents;
+    Assert(cr_server.cDisableEvents < UINT32_MAX/2);
+    crVBoxServerCheckVisibilityEvent(-1);
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_window.c

@@ -41 +41 @@
     pMural->fIsVisible = fIsVisible;
 
-    CRASSERT(pMural->screenId < RT_ELEMENTS(cr_server.acVisibleWindows));
+    CRASSERT(pMural->screenId < cr_server.screenCount);
 
     if (fIsVisible)
     {
-        ++cr_server.acVisibleWindows[pMural->screenId];
-        if (cr_server.acVisibleWindows[pMural->screenId] == 1)
-            crVBoxServerNotifyEvent(pMural->screenId, VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_3DDATA, (void*)1);
+        ++cr_server.aWinVisibilityInfos[pMural->screenId].cVisibleWindows;
     }
     else
     {
-        --cr_server.acVisibleWindows[pMural->screenId];
-        CRASSERT(cr_server.acVisibleWindows[pMural->screenId] < UINT32_MAX/2);
-        if (cr_server.acVisibleWindows[pMural->screenId] == 0)
-            crVBoxServerNotifyEvent(pMural->screenId, VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_3DDATA, NULL);
-    }
+        --cr_server.aWinVisibilityInfos[pMural->screenId].cVisibleWindows;
+        CRASSERT(cr_server.aWinVisibilityInfos[pMural->screenId].cVisibleWindows < UINT32_MAX/2);
+    }
+
+    crVBoxServerCheckVisibilityEvent(pMural->screenId);
 }