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

Timestamp:

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

Author:

vboxsync

Message:

crOpenGL: output redirect fixes

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_server.h (modified) (6 diffs)
• include/cr_vreg.h (modified) (1 diff)
• util/vreg.cpp (modified) (5 diffs)

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

@@ -209 +209 @@
     VBOXVR_SCR_COMPOSITOR_ENTRY CEntry;
     VBOXVR_SCR_COMPOSITOR_ENTRY RootVrCEntry;
+    void *pvORInstance;
+    GLuint idPBO;
 } CR_DISPLAY_ENTRY, *PCR_DISPLAY_ENTRY;
 /**/
@@ -238 +240 @@
     GLuint aidColorTexs[2];
 
-    void *pvOutputRedirectInstance;
+    void *pvReserved;
 
     CRCreateInfo_t CreateInfo;
@@ -250 +252 @@
     GLuint idDepthStencilRB;
     GLuint fboWidth, fboHeight;
-    GLuint idPBO;
 
     GLuint cDisabled;
@@ -260 +261 @@
     GLboolean fRootVrOn;
     GLboolean fForcePresentState;
+    GLboolean fOrPresentOnReenable;
 
     GLboolean fUseDefaultDEntry;
@@ -364 +366 @@
 {
     CRHashTable * pTexIdToDemInfoMap;
+    uint32_t cEntered;
+    RTLISTNODE ReleasedList;
 } CR_DISPLAY_ENTRY_MAP, *PCR_DISPLAY_ENTRY_MAP;
 
@@ -378 +382 @@
 
 void CrHlpFreeTexImage(CRContext *pCurCtx, GLuint idPBO, void *pvData);
-void* CrHlpGetTexImage(CRContext *pCurCtx, PVBOXVR_TEXTURE pTexture, GLuint idPBO, GLenum enmFormat);
-void CrHlpPutTexImage(CRContext *pCurCtx, PVBOXVR_TEXTURE pTexture, GLenum enmFormat, void *pvData);
+void* CrHlpGetTexImage(CRContext *pCurCtx, const VBOXVR_TEXTURE *pTexture, GLuint idPBO, GLenum enmFormat);
+void CrHlpPutTexImage(CRContext *pCurCtx, const VBOXVR_TEXTURE *pTexture, GLenum enmFormat, void *pvData);
 
 /* */

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

@@ -384 +384 @@
     return VBoxVrCompositorEntryIsInList(&pEntry->Ce);
 }
-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);
 VBOXVREGDECL(int) CrVrScrCompositorEntryRegionsSet(PVBOXVR_SCR_COMPOSITOR pCompositor, PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry, const RTPOINT *pPos, uint32_t cRegions, const RTRECT *paRegions, bool fPosRelated, bool *pfChanged);
 VBOXVREGDECL(int) CrVrScrCompositorEntryListIntersect(PVBOXVR_SCR_COMPOSITOR pCompositor, PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry, const VBOXVR_LIST *pList2, bool *pfChanged);

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)