Changeset 45251 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Mar 29, 2013 5:23:18 PM (12 years ago)

Author:

vboxsync

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

84635

Message:

crOpenGL: visible regions fixes

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

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

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

@@ -316 +316 @@
 }
 
-DECLINLINE(void) CrVrScrCompositorEntryTexUpdate(PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry, const VBOXVR_TEXTURE *pTex)
-{
-    pEntry->Tex = *pTex;
-    CrVrScrCompositorEntrySetChanged(pEntry, true);
-}
-
 DECLINLINE(const VBOXVR_TEXTURE *) CrVrScrCompositorEntryTexGet(const VBOXVR_SCR_COMPOSITOR_ENTRY *pEntry)
 {
@@ -337 +331 @@
 }
 
+VBOXVREGDECL(int) CrVrScrCompositorEntryTexUpdate(PVBOXVR_SCR_COMPOSITOR pCompositor, PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry, const VBOXVR_TEXTURE *pTex);
 VBOXVREGDECL(void) CrVrScrCompositorVisit(PVBOXVR_SCR_COMPOSITOR pCompositor, PFNVBOXVRSCRCOMPOSITOR_VISITOR pfnVisitor, void *pvVisitor);
 VBOXVREGDECL(void) CrVrScrCompositorEntrySetAllChanged(PVBOXVR_SCR_COMPOSITOR pCompositor, bool fChanged);

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

@@ -1339 +1339 @@
         else
         {
-            crWarning("VBoxVrCompositorEntryRegionsIntersect failed, rc %d", tmpRc);
+            WARN(("VBoxVrCompositorEntryRegionsIntersect failed, rc %d", tmpRc));
             rc = tmpRc;
         }
@@ -1368 +1368 @@
         else
         {
-            crWarning("VBoxVrCompositorEntryRegionsIntersect failed, rc %d", tmpRc);
+            WARN(("VBoxVrCompositorEntryRegionsIntersect failed, rc %d", tmpRc));
             rc = tmpRc;
         }
@@ -1493 +1493 @@
         else
         {
-            crWarning("RTMemAlloc failed!");
+            WARN(("RTMemAlloc failed!"));
             RTMemFree(pCompositor->paSrcRects);
             pCompositor->paSrcRects = NULL;
@@ -1500 +1500 @@
     else
     {
-        crWarning("RTMemAlloc failed!");
+        WARN(("RTMemAlloc failed!"));
         pCompositor->paDstRects = NULL;
     }
@@ -1632 +1632 @@
     if (!RT_SUCCESS(rc))
     {
-        crWarning("VBoxVrCompositorEntryRegionsAdd failed, rc %d", rc);
+        WARN(("VBoxVrCompositorEntryRegionsAdd failed, rc %d", rc));
         return rc;
     }
@@ -1658 +1658 @@
     if (!RT_SUCCESS(rc))
     {
-        crWarning("VBoxVrCompositorEntryRegionsSet failed, rc %d", rc);
+        WARN(("VBoxVrCompositorEntryRegionsSet failed, rc %d", rc));
         return rc;
     }
@@ -1690 +1690 @@
         if (!RT_SUCCESS(rc))
         {
-            crWarning("VBoxVrCompositorEntryRegionsTranslate failed rc %d", rc);
+            WARN(("VBoxVrCompositorEntryRegionsTranslate failed rc %d", rc));
             return rc;
         }
@@ -1706 +1706 @@
     }
     return VINF_SUCCESS;
+}
+
+static int crVrScrCompositorEntryEnsureRegionsInTex(PVBOXVR_SCR_COMPOSITOR pCompositor, PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry)
+{
+    RTRECT Rect;
+    Rect.xLeft = pEntry->Pos.x;
+    Rect.yTop = pEntry->Pos.y;
+    Rect.xRight = pEntry->Pos.x + pEntry->Tex.width;
+    Rect.yBottom = pEntry->Pos.y + pEntry->Tex.height;
+    int rc = CrVrScrCompositorEntryRegionsIntersect(pCompositor, pEntry, 1, &Rect, NULL);
+    if (!RT_SUCCESS(rc))
+        WARN(("CrVrScrCompositorEntryRegionsIntersect failed, rc %d", rc));
+    return rc;
 }
 
@@ -1718 +1731 @@
         if (!RT_SUCCESS(rc))
         {
-            crWarning("RegionsAdd: crVrScrCompositorEntryPositionSet failed rc %d", rc);
+            WARN(("RegionsAdd: crVrScrCompositorEntryPositionSet failed rc %d", rc));
             return rc;
         }
@@ -1726 +1739 @@
     if (!RT_SUCCESS(rc))
     {
-        crWarning("crVrScrCompositorEntryRegionsAdd failed, rc %d", rc);
+        WARN(("crVrScrCompositorEntryRegionsAdd failed, rc %d", rc));
         return rc;
+    }
+
+    if ((fPosChanged || (fChangeFlags & VBOXVR_COMPOSITOR_CF_ENTRY_REGIONS_CHANGED)) && pEntry)
+    {
+        rc = crVrScrCompositorEntryEnsureRegionsInTex(pCompositor, pEntry);
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("crVrScrCompositorEntryEnsureRegionsInTex failed, rc %d", rc));
+            return rc;
+        }
     }
 
@@ -1741 +1764 @@
     }
 
+    return VINF_SUCCESS;
+}
+
+VBOXVREGDECL(int) CrVrScrCompositorEntryTexUpdate(PVBOXVR_SCR_COMPOSITOR pCompositor, PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry, const VBOXVR_TEXTURE *pTex)
+{
+    bool fCompositorChanged = CrVrScrCompositorEntryIsUsed(pEntry) && (pEntry->Tex.width != pTex->width || pEntry->Tex.height != pTex->height);
+    pEntry->Tex = *pTex;
+    CrVrScrCompositorEntrySetChanged(pEntry, true);
+    if (fCompositorChanged)
+    {
+        int rc = crVrScrCompositorEntryEnsureRegionsInTex(pCompositor, pEntry);
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("crVrScrCompositorEntryEnsureRegionsInTex failed rc %d", rc));
+            return rc;
+        }
+    }
     return VINF_SUCCESS;
 }
@@ -1752 +1792 @@
     if (!RT_SUCCESS(rc))
     {
-        crWarning("RegionsSet: CrVrScrCompositorEntryRemove failed rc %d", rc);
+        WARN(("RegionsSet: CrVrScrCompositorEntryRemove failed rc %d", rc));
         return rc;
     }
@@ -1761 +1801 @@
         if (!RT_SUCCESS(rc))
         {
-            crWarning("RegionsSet: crVrScrCompositorEntryPositionSet failed rc %d", rc);
+            WARN(("RegionsSet: crVrScrCompositorEntryPositionSet failed rc %d", rc));
             return rc;
         }
@@ -1769 +1809 @@
     if (!RT_SUCCESS(rc))
     {
-        crWarning("crVrScrCompositorEntryRegionsSet failed, rc %d", rc);
+        WARN(("crVrScrCompositorEntryRegionsSet failed, rc %d", rc));
         return rc;
+    }
+
+    if (fChanged && CrVrScrCompositorEntryIsUsed(pEntry))
+    {
+        rc = crVrScrCompositorEntryEnsureRegionsInTex(pCompositor, pEntry);
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("crVrScrCompositorEntryEnsureRegionsInTex failed, rc %d", rc));
+            return rc;
+        }
     }
 
@@ -1785 +1835 @@
     if (!RT_SUCCESS(rc))
     {
-        crWarning("RegionsIntersect: VBoxVrCompositorEntryRegionsIntersect failed rc %d", rc);
+        WARN(("RegionsIntersect: VBoxVrCompositorEntryRegionsIntersect failed rc %d", rc));
         return rc;
     }
@@ -1807 +1857 @@
     if (!RT_SUCCESS(rc))
     {
-        crWarning("RegionsIntersect: VBoxVrCompositorEntryRegionsIntersect failed rc %d", rc);
+        WARN(("RegionsIntersect: VBoxVrCompositorEntryRegionsIntersect failed rc %d", rc));
         return rc;
     }
@@ -1841 +1891 @@
         else
         {
-            crWarning("CrVrScrCompositorEntryRegionsIntersect failed, rc %d", tmpRc);
+            WARN(("CrVrScrCompositorEntryRegionsIntersect failed, rc %d", tmpRc));
             rc = tmpRc;
         }
@@ -1870 +1920 @@
         else
         {
-            crWarning("CrVrScrCompositorEntryRegionsIntersect failed, rc %d", tmpRc);
+            WARN(("CrVrScrCompositorEntryRegionsIntersect failed, rc %d", tmpRc));
             rc = tmpRc;
         }
@@ -1886 +1936 @@
     if (!RT_SUCCESS(rc))
     {
-        crWarning("RegionsSet: crVrScrCompositorEntryPositionSet failed rc %d", rc);
+        WARN(("RegionsSet: crVrScrCompositorEntryPositionSet failed rc %d", rc));
         return rc;
     }
@@ -1898 +1948 @@
     if (!RT_SUCCESS(rc))
     {
-        crWarning("crVrScrCompositorRectsCheckInit failed, rc %d", rc);
+        WARN(("crVrScrCompositorRectsCheckInit failed, rc %d", rc));
         return rc;
     }
@@ -1940 +1990 @@
     else
     {
-        crWarning("RTCritSectInit failed rc %d", rc);
+        WARN(("RTCritSectInit failed rc %d", rc));
     }
     return rc;
@@ -1983 +2033 @@
     if (!RT_SUCCESS(rc))
     {
-        crWarning("crVrScrCompositorRectsCheckInit failed, rc %d", rc);
+        WARN(("crVrScrCompositorRectsCheckInit failed, rc %d", rc));
         return rc;
     }