Changeset 50246 in vbox for trunk

Timestamp:

Jan 27, 2014 3:00:45 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

91859

Message:

crOpenGL: bugfixing

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_vreg.h (modified) (1 diff)
• util/vreg.cpp (modified) (2 diffs)

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

@@ -111 +111 @@
 }
 
-DECLINLINE(bool) VBoxRectIsCoveres(const RTRECT *pRect, const RTRECT *pCovered)
+DECLINLINE(bool) VBoxRectCovers(const RTRECT *pRect, const RTRECT *pCovered)
 {
     Assert(pRect);

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

@@ -799 +799 @@
             if (pReg1)
             {
-                if (!VBoxRectCmp(&pReg1->Rect, pRect2))
+                if (VBoxRectCovers(pRect2, &RegRect1))
                 {
-                    /* no change, and we can break the iteration here */
+                    /* no change */
 
                     /* zero up the pReg1 to mark it as intersected (see the code after this inner loop) */
                     pReg1 = NULL;
-                    break;
+
+                    if (!VBoxRectCmp(pRect2, &RegRect1))
+                        break; /* and we can break the iteration here */
                 }
-                /* @todo: this can have false-alarming sometimes if the separated rects will then be joind into the original rect,
-                 * so far this should not be a problem for VReg clients, so keep it this way for now  */
-                fChanged = true;
-
-                /* re-use the reg entry */
-                vboxVrListRegRemove(pList, pReg1);
-                VBoxRectIntersect(&pReg1->Rect, pRect2);
-                Assert(!VBoxRectIsZero(&pReg1->Rect));
-
-                vboxVrListRegAddOrder(pList, pMemberEntry, pReg1);
-                pReg1 = NULL;
+                else
+                {
+                    /*just to ensure the VBoxRectCovers is true for equal rects */
+                    Assert(VBoxRectCmp(pRect2, &RegRect1));
+
+                    /* @todo: this can have false-alarming sometimes if the separated rects will then be joind into the original rect,
+                     * so far this should not be a problem for VReg clients, so keep it this way for now  */
+                    fChanged = true;
+
+                    /* re-use the reg entry */
+                    vboxVrListRegRemove(pList, pReg1);
+                    VBoxRectIntersect(&pReg1->Rect, pRect2);
+                    Assert(!VBoxRectIsZero(&pReg1->Rect));
+
+                    vboxVrListRegAddOrder(pList, pMemberEntry, pReg1);
+                    pReg1 = NULL;
+                }
             }
             else
@@ -1007 +1015 @@
             PVBOXVR_REG pReg1 = PVBOXVR_REG_FROM_ENTRY(pEntry1);
 
-            if (VBoxRectIsCoveres(&pReg1->Rect, &aRects[i]))
+            if (VBoxRectCovers(&pReg1->Rect, &aRects[i]))
             {
                 cCovered++;