Changeset 45133 in vbox

Timestamp:

Mar 22, 2013 5:51:03 AM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: vreg fixes

File:

• trunk/src/VBox/GuestHost/OpenGL/util/vreg.cpp (modified) (7 diffs)

trunk/src/VBox/GuestHost/OpenGL/util/vreg.cpp

@@ -1654 +1654 @@
 {
     bool fChanged;
+    CrVrScrCompositorEntryIsInList(pEntry);
     int rc = VBoxVrCompositorEntryRegionsSet(&pCompositor->Compositor, &pEntry->Ce, cRegions, paRegions, &fChanged);
     if (!RT_SUCCESS(rc))
@@ -1663 +1664 @@
     if (fChanged)
     {
+        CrVrScrCompositorEntrySetChanged(pEntry, true);
+        if (!CrVrScrCompositorEntryIsInList(pEntry))
+        {
+            pEntry->cRects = 0;
+            pEntry->paSrcRects = NULL;
+            pEntry->paDstRects = NULL;
+        }
         crVrScrCompositorRectsInvalidate(pCompositor);
     }
@@ -1675 +1683 @@
 static int crVrScrCompositorEntryPositionSet(PVBOXVR_SCR_COMPOSITOR pCompositor, PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry, const RTPOINT *pPos, bool *pfChanged)
 {
+    if (pfChanged)
+        *pfChanged = false;
     if (pEntry && (pEntry->Pos.x != pPos->x || pEntry->Pos.y != pPos->y))
     {
@@ -1691 +1701 @@
         pEntry->Pos = *pPos;
         CrVrScrCompositorEntrySetChanged(pEntry, true);
+
+        if (pfChanged)
+            *pfChanged = true;
     }
     return VINF_SUCCESS;
@@ -1733 +1746 @@
 VBOXVREGDECL(int) CrVrScrCompositorEntryRegionsSet(PVBOXVR_SCR_COMPOSITOR pCompositor, PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry, const RTPOINT *pPos, uint32_t cRegions, const RTRECT *paRegions, bool *pfChanged)
 {
+    /* @todo: the fChanged sate calculation is really rough now, this is enough for now though */
     bool fChanged = false, fPosChanged = false;
+    bool fWasInList = CrVrScrCompositorEntryIsInList(pEntry);
     int rc = CrVrScrCompositorEntryRemove(pCompositor, pEntry);
     if (!RT_SUCCESS(rc))
@@ -1759 +1774 @@
 
     if (pfChanged)
-        *pfChanged = fPosChanged || fChanged;
+        *pfChanged = fPosChanged || fChanged || fWasInList;
 
     return VINF_SUCCESS;
@@ -1903 +1918 @@
         return VINF_SUCCESS;
 
+    CrVrScrCompositorEntrySetChanged(pEntry, true);
+    pEntry->cRects = 0;
+    pEntry->paSrcRects = NULL;
+    pEntry->paDstRects = NULL;
+
     crVrScrCompositorRectsInvalidate(pCompositor);
     return VINF_SUCCESS;