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

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

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_window.c (modified) (4 diffs)

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

@@ -467 +467 @@
     /* the compositor lock is not needed actually since we have prevented renderspu from using the compositor */
     /* CrVrScrCompositorLock(&mural->Compositor); */
-    rc = CrVrScrCompositorEntryRemove(&mural->Compositor, &mural->CEntry);
-    if (!RT_SUCCESS(rc))
-    {
-        crWarning("CrVrScrCompositorEntryRemove failed, rc %d", rc);
-        goto end;
-    }
-    CrVrScrCompositorEntryInit(&mural->CEntry, &Tex);
-    /* initially set regions to all visible since this is what some guest assume
-     * and will not post any more visible regions command */
-    Rect.xLeft = 0;
-    Rect.xRight = width;
-    Rect.yTop = 0;
-    Rect.yBottom = height;
-    rc = CrVrScrCompositorEntryRegionsSet(&mural->Compositor, &mural->CEntry, NULL, 1, &Rect, NULL);
-    if (!RT_SUCCESS(rc))
-    {
-        crWarning("CrVrScrCompositorEntryRegionsSet failed, rc %d", rc);
-        goto end;
-    }
-    /* CrVrScrCompositorUnlock(&mural->Compositor); */
-    mural->width = width;
-    mural->height = height;
-
-    mural->fDataPresented = GL_FALSE;
-
-    if (cr_server.currentMural == mural)
-    {
-        crStateGetCurrent()->buffer.width = mural->width;
-        crStateGetCurrent()->buffer.height = mural->height;
-    }
-
-    if (mural->fRootVrOn)
-    {
-        rc = CrVrScrCompositorEntryRemove(&mural->RootVrCompositor, &mural->RootVrCEntry);
+    if (!mural->bReceivedRects)
+    {
+        rc = CrVrScrCompositorEntryRemove(&mural->Compositor, &mural->CEntry);
         if (!RT_SUCCESS(rc))
         {
@@ -506 +475 @@
             goto end;
         }
-        CrVrScrCompositorEntryInit(&mural->RootVrCEntry, &Tex);
+        CrVrScrCompositorEntryInit(&mural->CEntry, &Tex);
         /* initially set regions to all visible since this is what some guest assume
          * and will not post any more visible regions command */
@@ -513 +482 @@
         Rect.yTop = 0;
         Rect.yBottom = height;
-        rc = CrVrScrCompositorEntryRegionsSet(&mural->RootVrCompositor, &mural->RootVrCEntry, NULL, 1, &Rect, NULL);
+        rc = CrVrScrCompositorEntryRegionsSet(&mural->Compositor, &mural->CEntry, NULL, 1, &Rect, NULL);
+        if (!RT_SUCCESS(rc))
+        {
+            crWarning("CrVrScrCompositorEntryRegionsSet failed, rc %d", rc);
+            goto end;
+        }
+    }
+    else
+    {
+        rc = CrVrScrCompositorEntryTexUpdate(&mural->Compositor, &mural->CEntry, &Tex);
+        if (!RT_SUCCESS(rc))
+        {
+            crWarning("CrVrScrCompositorEntryTexUpdate failed, rc %d", rc);
+            goto end;
+        }
+    }
+
+    /* CrVrScrCompositorUnlock(&mural->Compositor); */
+    mural->width = width;
+    mural->height = height;
+
+    mural->fDataPresented = GL_FALSE;
+
+    if (cr_server.curClient && cr_server.curClient->currentMural == mural)
+    {
+        crStateGetCurrent()->buffer.width = mural->width;
+        crStateGetCurrent()->buffer.height = mural->height;
+    }
+
+    rc = CrVrScrCompositorEntryRegionsGet(&mural->Compositor, &mural->CEntry, &cRects, NULL, &pRects);
+    if (!RT_SUCCESS(rc))
+    {
+        crWarning("CrVrScrCompositorEntryRegionsGet failed, rc %d", rc);
+        goto end;
+    }
+
+    if (mural->fRootVrOn)
+    {
+        rc = CrVrScrCompositorEntryRemove(&mural->RootVrCompositor, &mural->RootVrCEntry);
+        if (!RT_SUCCESS(rc))
+        {
+            crWarning("CrVrScrCompositorEntryRemove failed, rc %d", rc);
+            goto end;
+        }
+        CrVrScrCompositorEntryInit(&mural->RootVrCEntry, &Tex);
+
+        rc = CrVrScrCompositorEntryRegionsSet(&mural->RootVrCompositor, &mural->RootVrCEntry, NULL, cRects, pRects, NULL);
         if (!RT_SUCCESS(rc))
         {
@@ -537 +552 @@
     else
     {
-        rc = CrVrScrCompositorEntryRegionsGet(&mural->Compositor, &mural->CEntry, &cRects, NULL, &pRects);
-        if (!RT_SUCCESS(rc))
-        {
-            crWarning("CrVrScrCompositorEntryRegionsGet failed, rc %d", rc);
-            goto end;
-        }
     }