儲存庫 vbox 的更動 50161

時間撮記:

2014-1-22 下午03:48:59 (11 年 以前)

作者:

vboxsync

訊息:

crOpenGL: bugfixes

檔案:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (修改) (14 筆差異)

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

@@ -188 +188 @@
         return VERR_INVALID_STATE;
     }
+
+    if (pScreen->u16Flags & VBVA_SCREEN_F_DISABLED)
+    {
+        CrVrScrCompositorClear(&pFb->Compositor);
+    }
+
     RTRECT Rect;
     Rect.xLeft = 0;
@@ -205 +211 @@
     if (pFb->pDisplay)
         pFb->pDisplay->FramebufferChanged(pFb);
+
     return VINF_SUCCESS;
 }
@@ -1859 +1866 @@
         if (pViewportRect->xLeft != mViewportRect.xLeft || pViewportRect->yTop != mViewportRect.yTop)
         {
-            const RTRECT* pRect = CrVrScrCompositorRectGet(getCompositor());
+            const RTRECT* pRect = getRect();
             int rc = mpWindow->SetPosition(pRect->xLeft - mViewportRect.xLeft, pRect->yTop - mViewportRect.yTop);
             if (!RT_SUCCESS(rc))
@@ -1938 +1945 @@
         }
 
-        const RTRECT* pRect = CrVrScrCompositorRectGet(getCompositor());
-        int rc = mpWindow->SetPosition(pRect->xLeft - mViewportRect.xLeft, pRect->yTop - mViewportRect.yTop);
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("SetComposition failed rc %d", rc));
-            return rc;
-        }
-
-        setRegionsChanged();
-
-        return mpWindow->SetSize((uint32_t)(pRect->xRight - pRect->xLeft), (uint32_t)(pRect->yBottom - pRect->yTop));
+        if (CrFbIsEnabled(getFramebuffer()))
+        {
+            const RTRECT* pRect = getRect();
+            int rc = mpWindow->SetPosition(pRect->xLeft - mViewportRect.xLeft, pRect->yTop - mViewportRect.yTop);
+            if (!RT_SUCCESS(rc))
+            {
+                WARN(("SetComposition failed rc %d", rc));
+                return rc;
+            }
+
+            setRegionsChanged();
+
+            return mpWindow->SetSize((uint32_t)(pRect->xRight - pRect->xLeft), (uint32_t)(pRect->yBottom - pRect->yTop));
+        }
+
+        return mpWindow->SetVisible(false);
+    }
+
+    virtual int windowSetCompositor(bool fSet)
+    {
+        if (fSet)
+        {
+            const struct VBOXVR_SCR_COMPOSITOR* pCompositor = CrFbGetCompositor(getFramebuffer());
+            return mpWindow->SetCompositor(pCompositor);
+        }
+        return mpWindow->SetCompositor(NULL);
     }
 
@@ -1968 +1990 @@
         }
 
-        rc = mpWindow->SetCompositor(NULL);
+        rc = windowSetCompositor(false);
         if (!RT_SUCCESS(rc))
         {
@@ -1994 +2016 @@
     virtual int windowSync()
     {
-        const struct VBOXVR_SCR_COMPOSITOR* pCompositor = getCompositor();
-        const RTRECT* pRect = CrVrScrCompositorRectGet(pCompositor);
+        const RTRECT* pRect = getRect();
 
         int rc = mpWindow->UpdateBegin();
@@ -2004 +2025 @@
         }
 
-        rc = mpWindow->SetCompositor(pCompositor);
+        rc = windowSetCompositor(true);
         if (!RT_SUCCESS(rc))
         {
@@ -2053 +2074 @@
     }
 
-    virtual const struct VBOXVR_SCR_COMPOSITOR* getCompositor()
-    {
-        return CrFbGetCompositor(getFramebuffer());
+    virtual const struct RTRECT* getRect()
+    {
+        const struct VBOXVR_SCR_COMPOSITOR* pCompositor = CrFbGetCompositor(getFramebuffer());
+        return CrVrScrCompositorRectGet(pCompositor);
     }
 
@@ -2195 +2217 @@
         }
 
-        rc = synchCompositorData();
+        rc = setRegionsChanged();
         if (!RT_SUCCESS(rc))
         {
@@ -2206 +2228 @@
 
 protected:
+    virtual int windowSetCompositor(bool fSet)
+    {
+        if (fSet)
+            return getWindow()->SetCompositor(&mCompositor);
+        return getWindow()->SetCompositor(NULL);
+    }
+
     virtual void ueRegions()
     {
@@ -2211 +2240 @@
     }
 
+    int compositorMarkUpdated()
+    {
+        CrVrScrCompositorClear(&mCompositor);
+        int rc = CrVrScrCompositorRectSet(&mCompositor, CrVrScrCompositorRectGet(CrFbGetCompositor(getFramebuffer())), NULL);
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("err"));
+            return rc;
+        }
+
+        rc = setRegionsChanged();
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("screenChanged failed %d", rc));
+            return rc;
+        }
+
+        return VINF_SUCCESS;
+    }
+
     virtual int screenChanged()
     {
-        int rc = CrFbDisplayWindow::screenChanged();
+        int rc = compositorMarkUpdated();
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("err"));
+            return rc;
+        }
+
+        rc = CrFbDisplayWindow::screenChanged();
         if (!RT_SUCCESS(rc))
         {
@@ -2220 +2276 @@
         }
 
-        rc = synchCompositorData();
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("err"));
-            return rc;
-        }
-
-        return VINF_SUCCESS;
-    }
-
-    virtual const struct VBOXVR_SCR_COMPOSITOR* getCompositor()
-    {
-        return &mCompositor;
+        return VINF_SUCCESS;
+    }
+
+    virtual const struct RTRECT* getRect()
+    {
+        return CrVrScrCompositorRectGet(&mCompositor);
     }
 
@@ -2298 +2347 @@
     }
 
-    int synchCompositorData()
-    {
-        CrVrScrCompositorClear(&mCompositor);
-
-        const struct VBVAINFOSCREEN* pScreenInfo = CrFbGetScreenInfo(getFramebuffer());
-        mPos.x = pScreenInfo->i32OriginX;
-        mPos.y = pScreenInfo->i32OriginY;
-
-        int rc = CrVrScrCompositorRectSet(&mCompositor, CrVrScrCompositorRectGet(CrFbGetCompositor(getFramebuffer())), NULL);
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("CrVrScrCompositorRectSet failed, rc %d", rc));
-            return rc;
-        }
-        rc = synchCompositorRegions();
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("synchCompositorRegions failed, rc %d", rc));
-            return rc;
-        }
-
-        return rc;
-    }
-
     virtual int synchCompositor()
     {
-        int rc = CrVrScrCompositorRectSet(&mCompositor, CrVrScrCompositorRectGet(CrFbGetCompositor(getFramebuffer())), NULL);
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("CrVrScrCompositorRectSet failed, rc %d", rc));
+        int rc = compositorMarkUpdated();
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("compositorMarkUpdated failed, rc %d", rc));
             return rc;
         }
@@ -2335 +2360 @@
         {
             WARN(("fbSynchAddAllEntries failed, rc %d", rc));
-            return rc;
-        }
-
-        rc = synchCompositorRegions();
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("synchCompositorRegions failed, rc %d", rc));
             return rc;
         }