儲存庫 vbox 的更動 50217

時間撮記:

2014-1-24 上午11:37:07 (11 年 以前)

作者:

vboxsync

訊息:

crOpenGL: notification mechanism fixes

位置:

trunk/src/VBox

檔案:

• GuestHost/OpenGL/include/cr_server.h (修改) (2 筆差異)
• HostServices/SharedOpenGL/crserverlib/server.h (修改) (1 筆差異)
• HostServices/SharedOpenGL/crserverlib/server_config.c (修改) (1 筆差異)
• HostServices/SharedOpenGL/crserverlib/server_main.c (修改) (3 筆差異)
• HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (修改) (5 筆差異)

trunk/src/VBox/GuestHost/OpenGL/include/cr_server.h

@@ -334 +334 @@
     RTRECT Rect;
 } CRScreenViewportInfo;
-
-typedef struct CRWinVisibilityInfo
-{
-    uint32_t cVisibleWindows        : 30;
-    uint32_t fLastReportedVisible   : 1;
-    uint32_t fVisibleChanged        : 1;
-} CRWinVisibilityInfo;
 
 /* BFB (BlitFramebuffer Blitter) flags
@@ -485 +478 @@
     uint32_t              u32Caps;
 
-    uint32_t cDisableEvents;
-    CRWinVisibilityInfo  aWinVisibilityInfos[CR_MAX_GUEST_MONITORS];
-
     PFNCRSERVERNOTIFYEVENT pfnNotifyEventCB;
 

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

@@ -139 +139 @@
 
 void crVBoxServerNotifyEvent(int32_t idScreen, uint32_t uEvent, void*pvData);
-void crVBoxServerCheckVisibilityEvent(int32_t idScreen);
 
 void crServerRedirMuralFbClear(CRMuralInfo *mural);

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

@@ -54 +54 @@
     cr_server.bUsePBOForReadback = GL_FALSE;
     cr_server.bWindowsInitiallyHidden = GL_FALSE;
-
-    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

@@ -2634 +2634 @@
 }
 
-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].fVisibleChanged
-            && !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;
-    cr_server.aWinVisibilityInfos[idScreen].fVisibleChanged = 0;
-}
-
 void crServerWindowReparent(CRMuralInfo *pMural)
 {
@@ -2725 +2697 @@
 
     renderspuSetWindowId(SCREEN(0).winID);
-
-/*    crVBoxServerNotifyEvent(sIndex, VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_3DDATA, NULL); */
 
     return VINF_SUCCESS;
@@ -2790 +2760 @@
 
     CrPMgrScreenChanged((uint32_t)sIndex);
-
-    crVBoxServerNotifyEvent(sIndex, VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_3DDATA,
-            cr_server.aWinVisibilityInfos[sIndex].cVisibleWindows ? (void*)1 : NULL);
 
     return VINF_SUCCESS;

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

@@ -1737 +1737 @@
 };
 
+typedef union CR_FBDISPWINDOW_FLAGS
+{
+    struct {
+        uint32_t fNeVisible : 1;
+        uint32_t fNeForce   : 1;
+        uint32_t Reserved   : 30;
+    };
+    uint32_t u32Value;
+} CR_FBDISPWINDOW_FLAGS;
 class CrFbDisplayWindow : public CrFbDisplayBase
 {
@@ -1742 +1751 @@
     CrFbDisplayWindow(CrFbWindow *pWindow, const RTRECT *pViewportRect) :
         mpWindow(pWindow),
-        mViewportRect(*pViewportRect)
-    {
+        mViewportRect(*pViewportRect),
+        mu32Screen(~0)
+    {
+        mFlags.u32Value = 0;
         CRASSERT(pWindow);
     }
@@ -1927 +1938 @@
             WARN(("window reparent failed"));
 
+        mFlags.fNeForce = 1;
+
         return rc;
     }
 
+    virtual bool isVisible()
+    {
+        HCR_FRAMEBUFFER hFb = getFramebuffer();
+        if (!hFb)
+            return false;
+        const struct VBOXVR_SCR_COMPOSITOR* pCompositor = CrFbGetCompositor(hFb);
+        return CrVrScrCompositorIsEmpty(pCompositor);
+    }
+
 protected:
+    virtual void onUpdateEnd()
+    {
+        CrFbDisplayBase::onUpdateEnd();
+        bool fVisible = isVisible();
+        if (mFlags.fNeVisible != fVisible || mFlags.fNeForce)
+        {
+            crVBoxServerNotifyEvent(mu32Screen, VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_3DDATA, fVisible ? (void*)1 : NULL);
+            mFlags.fNeVisible = fVisible;
+            mFlags.fNeForce = 0;
+        }
+    }
+
     virtual void ueRegions()
     {
@@ -2070 +2104 @@
         }
 
+        mu32Screen = CrFbGetScreenInfo(getFramebuffer())->u32ViewIndex;
+
         return windowSync();
     }
@@ -2083 +2119 @@
     CrFbWindow *mpWindow;
     RTRECT mViewportRect;
+    CR_FBDISPWINDOW_FLAGS mFlags;
+    uint32_t mu32Screen;
 };