Changeset 47623 in vbox for trunk/src/VBox/GuestHost/OpenGL/util

Timestamp:

Aug 8, 2013 9:19:43 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: output redirect fixes

File:

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

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

@@ -1862 +1862 @@
 
 
-static int crVrScrCompositorEntryRegionsAdd(PVBOXVR_SCR_COMPOSITOR pCompositor, PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry, uint32_t cRegions, const RTRECT *paRegions, uint32_t *pfChangedFlags)
+static int crVrScrCompositorEntryRegionsAdd(PVBOXVR_SCR_COMPOSITOR pCompositor, PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry, uint32_t cRegions, const RTRECT *paRegions, VBOXVR_SCR_COMPOSITOR_ENTRY **ppReplacedScrEntry, uint32_t *pfChangedFlags)
 {
     uint32_t fChangedFlags = 0;
@@ -1900 +1900 @@
     if (pfChangedFlags)
         *pfChangedFlags = fChangedFlags;
+
+    if (ppReplacedScrEntry)
+        *ppReplacedScrEntry = pReplacedScrEntry;
+
     return VINF_SUCCESS;
 }
@@ -1987 +1991 @@
 }
 
-VBOXVREGDECL(int) CrVrScrCompositorEntryRegionsAdd(PVBOXVR_SCR_COMPOSITOR pCompositor, PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry, const RTPOINT *pPos, uint32_t cRegions, const RTRECT *paRegions, bool fPosRelated, uint32_t *pfChangeFlags)
+VBOXVREGDECL(int) CrVrScrCompositorEntryRegionsAdd(PVBOXVR_SCR_COMPOSITOR pCompositor, PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry, const RTPOINT *pPos, uint32_t cRegions, const RTRECT *paRegions, bool fPosRelated, VBOXVR_SCR_COMPOSITOR_ENTRY **ppReplacedScrEntry, uint32_t *pfChangeFlags)
 {
     int rc;
@@ -2028 +2032 @@
     }
 
-    rc = crVrScrCompositorEntryRegionsAdd(pCompositor, pEntry, cRegions, paRegions, &fChangeFlags);
+    rc = crVrScrCompositorEntryRegionsAdd(pCompositor, pEntry, cRegions, paRegions, ppReplacedScrEntry, &fChangeFlags);
     if (!RT_SUCCESS(rc))
     {
@@ -2054 +2058 @@
     if (fChangeFlags & VBOXVR_COMPOSITOR_CF_ENTRY_REPLACED)
         fPosChanged = false;
+    else if (ppReplacedScrEntry)
+        *ppReplacedScrEntry = NULL;
 
     if (pfChangeFlags)