Changeset 48726 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Timestamp:

Sep 27, 2013 10:19:54 AM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: seamless fixes

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server.h (modified) (1 diff)
• server_main.c (modified) (5 diffs)
• server_presenter.cpp (modified) (2 diffs)
• server_window.c (modified) (7 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server.h

@@ -119 +119 @@
 void crServerMuralVisibleRegion( CRMuralInfo *mural, GLint cRects, const GLint *pRects );
 void crServerMuralShow( CRMuralInfo *mural, GLint state );
-int crServerMuralSynchRootVr(CRMuralInfo *mural);
+int crServerMuralSynchRootVr(CRMuralInfo *mural, bool *pfChanged);
 
 GLint crServerGenerateID(GLint *pCounter);

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -332 +332 @@
 #endif
 
-    cr_server.bUseMultipleContexts = (crGetenv( "CR_SERVER_ENABLE_MULTIPLE_CONTEXTS" ) != NULL);
+//    cr_server.bUseMultipleContexts = (crGetenv( "CR_SERVER_ENABLE_MULTIPLE_CONTEXTS" ) != NULL);
 
     if (cr_server.bUseMultipleContexts)
@@ -443 +443 @@
 #endif
 
-    cr_server.bUseMultipleContexts = (crGetenv( "CR_SERVER_ENABLE_MULTIPLE_CONTEXTS" ) != NULL);
+//    cr_server.bUseMultipleContexts = (crGetenv( "CR_SERVER_ENABLE_MULTIPLE_CONTEXTS" ) != NULL);
 
     if (cr_server.bUseMultipleContexts)
@@ -2849 +2849 @@
         }
 
-        rc = crServerMuralSynchRootVr(pMI);
+        rc = crServerMuralSynchRootVr(pMI, NULL);
         if (!RT_SUCCESS(rc))
         {
@@ -2913 +2913 @@
 
     crHashtableWalk(cr_server.muralTable, crVBoxServerSetRootVisibleRegionCB, NULL);
-#if 0
+
     for (i = 0; i < cr_server.screenCount; ++i)
     {
@@ -2922 +2922 @@
         CrDpRootUpdate(pDisplay);
     }
-#endif
+
     return VINF_SUCCESS;
 }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp

@@ -47 +47 @@
     }
 
-    crServerMuralVisibleRegion(&pDisplay->Mural, 0, NULL);
+    crServerWindowVisibleRegion(&pDisplay->Mural);
+    crServerDEntryAllVibleRegions(&pDisplay->Mural);
+
     crServerMuralShow(&pDisplay->Mural, GL_TRUE);
 
@@ -226 +228 @@
             uint32_t cRects;
             const RTRECT *pRects;
-            rc = CrVrScrCompositorRegionsGet(&pDisplay->Mural.Compositor, &cRects, NULL, &pRects, NULL);
-            if (RT_SUCCESS(rc))
-                crServerMuralVisibleRegion(&pDisplay->Mural, cRects, (GLint *)pRects);
+            bool fChanged = true;
+            if (pDisplay->Mural.fRootVrOn)
+            {
+                int rc = crServerMuralSynchRootVr(&pDisplay->Mural, &fChanged);
+                if (!RT_SUCCESS(rc))
+                {
+                    crWarning("crServerMuralSynchRootVr failed, rc %d", rc);
+                    fChanged = false;
+                }
+            }
+
+            if (fChanged)
+                crServerWindowVisibleRegion(&pDisplay->Mural);
+
+            crServerDEntryAllVibleRegions(&pDisplay->Mural);
+
+            Assert(!pReplacedScrEntry);
+        }
+        else if (fChangeFlags & VBOXVR_COMPOSITOR_CF_ENTRY_REGIONS_CHANGED)
+        {
+            if (fChangeFlags & VBOXVR_COMPOSITOR_CF_ENTRY_REPLACED)
+            {
+                Assert(pReplacedScrEntry);
+                Assert(pEntry);
+                if (pDisplay->Mural.fRootVrOn)
+                {
+                    CR_DISPLAY_ENTRY *pReplacedDEntry = CR_DENTRY_FROM_CENTRY(pReplacedScrEntry);
+                    Assert(CrVrScrCompositorEntryIsUsed(&pReplacedDEntry->RootVrCEntry));
+                    Assert(!CrVrScrCompositorEntryIsUsed(&pEntry->RootVrCEntry));
+                    CrVrScrCompositorEntryInit(&pEntry->RootVrCEntry, CrVrScrCompositorEntryTexGet(&pEntry->CEntry), NULL);
+                    CrVrScrCompositorEntryFlagsSet(&pEntry->RootVrCEntry, CrVrScrCompositorEntryFlagsGet(&pEntry->CEntry));
+                    CrVrScrCompositorEntryReplace(&pDisplay->Mural.RootVrCompositor, &pReplacedDEntry->RootVrCEntry, &pEntry->RootVrCEntry);
+                }
+            }
             else
-                crWarning("CrVrScrCompositorRegionsGet failed, rc %d", rc);
-
-            Assert(!pReplacedScrEntry);
-        }
-        else if (fChangeFlags & VBOXVR_COMPOSITOR_CF_ENTRY_REPLACED)
-        {
-            Assert(pReplacedScrEntry);
+            {
+                Assert(!pReplacedScrEntry);
+                if (pDisplay->Mural.fRootVrOn)
+                {
+                    bool fChanged = false;
+                    int rc = crServerMuralSynchRootVr(&pDisplay->Mural, &fChanged);
+                    if (RT_SUCCESS(rc))
+                    {
+                        if (fChanged)
+                            crServerWindowVisibleRegion(&pDisplay->Mural);
+                    }
+                    else
+                        crWarning("crServerMuralSynchRootVr failed, rc %d", rc);
+                }
+            }
         }
         else
         {
+            Assert(!(fChangeFlags & VBOXVR_COMPOSITOR_CF_ENTRY_REPLACED));
             Assert(!pReplacedScrEntry);
         }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_window.c

@@ -216 +216 @@
         uint32_t cRects;
         const RTRECT *pRects;
-        int rc = crServerMuralSynchRootVr(mural);
+        int rc = crServerMuralSynchRootVr(mural, NULL);
         if (RT_SUCCESS(rc))
         {
@@ -504 +504 @@
     Assert(!CrVrScrCompositorEntryIsUsed(&pDEntry->RootVrCEntry));
     CrVrScrCompositorEntryInit(&pDEntry->RootVrCEntry, CrVrScrCompositorEntryTexGet(pEntry), NULL);
+    CrVrScrCompositorEntryFlagsSet(&pDEntry->RootVrCEntry, CrVrScrCompositorEntryFlagsGet(pEntry));
     return &pDEntry->RootVrCEntry;
 }
 
-int crServerMuralSynchRootVr(CRMuralInfo *mural)
+int crServerMuralSynchRootVr(CRMuralInfo *mural, bool *pfChanged)
 {
     int rc;
@@ -517 +518 @@
     CrVrScrCompositorClear(&mural->RootVrCompositor);
 
-    rc = CrVrScrCompositorIntersectedList(&mural->Compositor, &cr_server.RootVr, &mural->RootVrCompositor, crServerMuralGetRootVrCEntry, NULL, NULL);
+    rc = CrVrScrCompositorIntersectedList(&mural->Compositor, &cr_server.RootVr, &mural->RootVrCompositor, crServerMuralGetRootVrCEntry, NULL, pfChanged);
     if (!RT_SUCCESS(rc))
     {
@@ -609 +610 @@
     if (mural->fRootVrOn)
     {
-        rc = crServerMuralSynchRootVr(mural);
+        rc = crServerMuralSynchRootVr(mural, NULL);
         if (!RT_SUCCESS(rc))
         {
@@ -693 +694 @@
             if (mural->fRootVrOn)
             {
-                int rc = crServerMuralSynchRootVr(mural);
+                int rc = crServerMuralSynchRootVr(mural, NULL);
                 if (RT_SUCCESS(rc))
                 {
@@ -764 +765 @@
     }
 
-    if (mural->fUseDefaultDEntry)
-    {
-        /* NOTE: we can do it even if !(mural->fPresentMode & CR_SERVER_REDIR_F_DISPLAY) to make sure the compositor data is always up to date */
-        /* the compositor lock is not needed actually since we have prevented renderspu from using the compositor */
-        /* CrVrScrCompositorLock(&mural->Compositor); */
-        rc = CrVrScrCompositorEntryRegionsSet(&mural->Compositor, &mural->DefaultDEntry.CEntry, NULL, cRects, (const RTRECT *)pRects, false, &fRegionsChanged);
-        /*CrVrScrCompositorUnlock(&mural->Compositor);*/
-        if (!RT_SUCCESS(rc))
-        {
-            crWarning("CrVrScrCompositorEntryRegionsSet failed, rc %d", rc);
-            goto end;
-        }
-    }
-    else
-    {
-        fRegionsChanged = true;
+    Assert(mural->fUseDefaultDEntry);
+    /* NOTE: we can do it even if !(mural->fPresentMode & CR_SERVER_REDIR_F_DISPLAY) to make sure the compositor data is always up to date */
+    /* the compositor lock is not needed actually since we have prevented renderspu from using the compositor */
+    /* CrVrScrCompositorLock(&mural->Compositor); */
+    rc = CrVrScrCompositorEntryRegionsSet(&mural->Compositor, &mural->DefaultDEntry.CEntry, NULL, cRects, (const RTRECT *)pRects, false, &fRegionsChanged);
+    /*CrVrScrCompositorUnlock(&mural->Compositor);*/
+    if (!RT_SUCCESS(rc))
+    {
+        crWarning("CrVrScrCompositorEntryRegionsSet failed, rc %d", rc);
+        goto end;
     }
 
@@ -786 +781 @@
         if (mural->fRootVrOn)
         {
-            rc = crServerMuralSynchRootVr(mural);
+            rc = crServerMuralSynchRootVr(mural, NULL);
             if (!RT_SUCCESS(rc))
             {