Changeset 45159 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Mar 25, 2013 10:31:13 AM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: do not pass intersected rects to vrdp backend

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_main.c (modified) (1 diff)
• server_muralfbo.c (modified) (1 diff)
• server_window.c (modified) (7 diffs)

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

@@ -2409 +2409 @@
     cr_server.head_spu->dispatch_table.WindowVisibleRegion(pMI->spuWindow, cRects, pRects);
 
-    if (pMI->pvOutputRedirectInstance)
-    {
-        /* @todo the code assumes that RTRECT == four GLInts. */
-        cr_server.outputRedirect.CRORVisibleRegion(pMI->pvOutputRedirectInstance,
-                                                   cRects, pRects);
-    }
-
     pMI->fRootVrOn = cr_server.fRootVrOn;
 

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

@@ -87 +87 @@
         if (mural->pvOutputRedirectInstance)
         {
+            uint32_t cRects;
+            const RTRECT *pRects;
+
+            int rc = CrVrScrCompositorEntryRegionsGet(&mural->Compositor, &mural->CEntry, &cRects, NULL, &pRects);
+            if (!RT_SUCCESS(rc))
+            {
+                crWarning("CrVrScrCompositorEntryRegionsGet failed, rc %d", rc);
+                return;
+            }
+
             cr_server.outputRedirect.CRORGeometry(mural->pvOutputRedirectInstance,
                                                   mural->hX, mural->hY,

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

@@ -130 +130 @@
                 /* do visible rects only ig they differ from the default */
                 cr_server.head_spu->dispatch_table.WindowVisibleRegion(mural->spuWindow, cRects, pRects);
-
-                if (mural->pvOutputRedirectInstance)
-                {
-                    /* @todo the code assumes that RTRECT == four GLInts. */
-                    cr_server.outputRedirect.CRORVisibleRegion(mural->pvOutputRedirectInstance,
-                                                               cRects, pRects);
-                }
             }
         }
@@ -558 +551 @@
         if (mural->pvOutputRedirectInstance)
         {
+            if (mural->fRootVrOn)
+            {
+                rc = CrVrScrCompositorEntryRegionsGet(&mural->Compositor, &mural->CEntry, &cRects, NULL, &pRects);
+                if (!RT_SUCCESS(rc))
+                {
+                    crWarning("CrVrScrCompositorEntryRegionsGet failed, rc %d", rc);
+                    return;
+                }
+            }
             /* @todo the code assumes that RTRECT == four GLInts. */
             cr_server.outputRedirect.CRORVisibleRegion(mural->pvOutputRedirectInstance,
-                                                       cRects, (RTRECT *)pRects);
+                    cRects, pRects);
         }
 
@@ -648 +650 @@
                 {
                     cr_server.head_spu->dispatch_table.WindowVisibleRegion(mural->spuWindow, cRects, pRects);
-
-                    if (mural->pvOutputRedirectInstance)
-                    {
-                        /* @todo the code assumes that RTRECT == four GLInts. */
-                        cr_server.outputRedirect.CRORVisibleRegion(mural->pvOutputRedirectInstance,
-                                                                   cRects, pRects);
-                    }
                 }
                 else
@@ -727 +722 @@
     if (fRegionsChanged)
     {
+        const RTRECT * pRealRects;
+        uint32_t cRealRects;
+
         if (mural->fRootVrOn)
         {
@@ -744 +742 @@
             }
 
-            rc = CrVrScrCompositorEntryRegionsGet(&mural->RootVrCompositor, &mural->RootVrCEntry, &cRects, NULL, (const RTRECT **)&pRects);
+            rc = CrVrScrCompositorEntryRegionsGet(&mural->RootVrCompositor, &mural->RootVrCEntry, &cRealRects, NULL, &pRealRects);
             if (!RT_SUCCESS(rc))
             {
@@ -753 +751 @@
         else
         {
-            rc = CrVrScrCompositorEntryRegionsGet(&mural->Compositor, &mural->CEntry, &cRects, NULL, (const RTRECT **)&pRects);
+            rc = CrVrScrCompositorEntryRegionsGet(&mural->Compositor, &mural->CEntry, &cRealRects, NULL, &pRealRects);
             if (!RT_SUCCESS(rc))
             {
@@ -761 +759 @@
         }
 
-        cr_server.head_spu->dispatch_table.WindowVisibleRegion(mural->spuWindow, cRects, pRects);
+        cr_server.head_spu->dispatch_table.WindowVisibleRegion(mural->spuWindow, cRealRects, pRealRects);
 
         if (mural->pvOutputRedirectInstance)
         {
+            if (mural->fRootVrOn)
+            {
+                rc = CrVrScrCompositorEntryRegionsGet(&mural->Compositor, &mural->CEntry, &cRealRects, NULL, &pRealRects);
+                if (!RT_SUCCESS(rc))
+                {
+                    crWarning("CrVrScrCompositorEntryRegionsGet failed, rc %d", rc);
+                    return;
+                }
+            }
             /* @todo the code assumes that RTRECT == four GLInts. */
-            cr_server.outputRedirect.CRORVisibleRegion(mural->pvOutputRedirectInstance,
-                                                       cRects, (RTRECT *)pRects);
+            cr_server.outputRedirect.CRORVisibleRegion(mural->pvOutputRedirectInstance, cRealRects, pRealRects);
         }
     }