Changeset 50243 in vbox for trunk/src/VBox/HostServices

Timestamp:

Jan 27, 2014 12:23:48 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: bugfixes for seamless and other

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (modified) (10 diffs)

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

@@ -257 +257 @@
     struct {
         uint32_t fCreateNotified : 1;
-        uint32_t Reserved : 31;
+        uint32_t fInList         : 1;
+        uint32_t Reserved        : 30;
     };
     uint32_t Value;
@@ -497 +498 @@
         /* 2. mark the replaced entry is destroyed */
         Assert(pFbEntry->Flags.fCreateNotified);
+        Assert(pFbEntry->Flags.fInList);
         pFbEntry->Flags.fCreateNotified = 0;
+        pFbEntry->Flags.fInList = 0;
         pFbReplacingEntry->Flags.fCreateNotified = 1;
+        pFbReplacingEntry->Flags.fInList = 1;
     }
     else
     {
-        if (pFb->pDisplay)
-            pFb->pDisplay->EntryRemoved(pFb, pFbEntry);
+        if (pFbEntry->Flags.fInList)
+        {
+            pFbEntry->Flags.fInList = 0;
+            if (pFb->pDisplay)
+                pFb->pDisplay->EntryRemoved(pFb, pFbEntry);
+        }
     }
 
@@ -634 +642 @@
         pNewEntry = &hEntry->Entry;
         fEntryWasInList = CrVrScrCompositorEntryIsUsed(pNewEntry);
+
+        Assert(!hEntry->Flags.fInList == !fEntryWasInList);
     }
     else
@@ -656 +666 @@
                 }
 
+                Assert(!hEntry->Flags.fInList);
+                hEntry->Flags.fInList = 1;
+
                 if (pFb->pDisplay)
                     pFb->pDisplay->EntryAdded(pFb, hEntry);
@@ -709 +722 @@
         pNewEntry = &hEntry->Entry;
         fEntryWasInList = CrVrScrCompositorEntryIsUsed(pNewEntry);
+        Assert(!hEntry->Flags.fInList == !fEntryWasInList);
     }
     else
@@ -732 +746 @@
                             pFb->pDisplay->EntryCreated(pFb, hEntry);
                     }
+
+                    Assert(!hEntry->Flags.fInList);
+                    hEntry->Flags.fInList = 1;
 
                     if (pFb->pDisplay)
@@ -1866 +1883 @@
     }
 
+    const RTRECT* getViewportRect()
+    {
+        return &mViewportRect;
+    }
+
     virtual int setViewportRect(const RTRECT *pViewportRect)
     {
@@ -2130 +2152 @@
     {
         CrVrScrCompositorInit(&mCompositor, NULL);
-        memset(&mPos, 0, sizeof (mPos));
     }
 
@@ -2411 +2432 @@
     void rootVrTranslateForPos()
     {
-        int32_t dx = cr_server.RootVrCurPoint.x - mPos.x;
-        int32_t dy = cr_server.RootVrCurPoint.y - mPos.y;
-
-        cr_server.RootVrCurPoint.x = mPos.x;
-        cr_server.RootVrCurPoint.y = mPos.y;
+        const RTRECT *pRect = getViewportRect();
+        const struct VBVAINFOSCREEN* pScreen = CrFbGetScreenInfo(getFramebuffer());
+        int32_t x = pScreen->i32OriginX;
+        int32_t y = pScreen->i32OriginY;
+        int32_t dx = cr_server.RootVrCurPoint.x - x;
+        int32_t dy = cr_server.RootVrCurPoint.y - y;
+
+        cr_server.RootVrCurPoint.x = x;
+        cr_server.RootVrCurPoint.y = y;
 
         VBoxVrListTranslate(&cr_server.RootVr, dx, dy);
@@ -2431 +2456 @@
 private:
     VBOXVR_SCR_COMPOSITOR mCompositor;
-    RTPOINT mPos;
 };