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

Timestamp:

Mar 1, 2013 2:11:35 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84054

Message:

crOpenGL: window attr change fixes

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserverlib/server_muralfbo.c (modified) (1 diff)
• crserverlib/server_window.c (modified) (4 diffs)
• render/renderspu.c (modified) (1 diff)

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

@@ -279 +279 @@
     else
     {
+        if (redir == CR_SERVER_REDIR_NONE)
+        {
+            /* tell renderspu we do not want compositor presentation anymore
+             * renderspu will ensure its redraw thread is done with using the compositor, etc. */
+            cr_server.head_spu->dispatch_table.VBoxPresentComposition(mural->spuWindow, NULL, NULL);
+        }
+
         if (mural->fUseFBO == CR_SERVER_REDIR_FBO_RAM)
             cr_server.head_spu->dispatch_table.WindowShow(mural->spuWindow, mural->bVisible);

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

@@ -326 +326 @@
         Tex.target = GL_TEXTURE_2D;
         Tex.hwid = 0;
-        CrVrScrCompositorLock(&mural->Compositor);
+
+        if (mural->fUseFBO != CR_SERVER_REDIR_NONE)
+        {
+            /* since we're going to change the current compositor & the window we need to avoid
+             * renderspu fron dealing with inconsistent data, i.e. modified compositor and
+             * still unmodified window.
+             * So what we do is:
+             * 1. tell renderspu to stop using the current compositor -> renderspu would do necessary synchronization with its redraw thread to ensure compositor is no longer used
+             * 2. do necessary modifications
+             * 3. (so far not needed for resize, but in case it is in the future) re-set the compositor */
+
+            /* 1. tell renderspu to stop using the current compositor (see above comment) */
+            cr_server.head_spu->dispatch_table.VBoxPresentComposition(mural->spuWindow, NULL, NULL);
+        }
+
+        /* 2. do necessary modifications (see above comment) */
+        /* NOTE: we can do it even if mural->fUseFBO == CR_SERVER_REDIR_NONE 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); */
         CrVrScrCompositorEntryRemove(&mural->Compositor, &mural->CEntry);
-        CrVrScrCompositorUnlock(&mural->Compositor);
         CrVrScrCompositorEntryInit(&mural->CEntry, &Tex);
+        /* CrVrScrCompositorUnlock(&mural->Compositor); */
         mural->width = width;
         mural->height = height;
-    }
-
-    if (cr_server.curClient && cr_server.curClient->currentMural == mural)
-    {
-        crStateGetCurrent()->buffer.width = mural->width;
-        crStateGetCurrent()->buffer.height = mural->height;
-    }
-
-    crServerCheckMuralGeometry(mural);
-
-    cr_server.head_spu->dispatch_table.WindowSize(mural->spuWindow, width, height);
+
+        if (cr_server.curClient && cr_server.curClient->currentMural == mural)
+        {
+            crStateGetCurrent()->buffer.width = mural->width;
+            crStateGetCurrent()->buffer.height = mural->height;
+        }
+
+        crServerCheckMuralGeometry(mural);
+
+        cr_server.head_spu->dispatch_table.WindowSize(mural->spuWindow, width, height);
+
+        /* 3. (so far not needed for resize, but in case it is in the future) re-set the compositor (see above comment) */
+        /*
+        if (mural->fUseFBO != CR_SERVER_REDIR_NONE)
+        {
+            cr_server.head_spu->dispatch_table.VBoxPresentComposition(mural->spuWindow, &mural->Compositor, &mural->CEntry);
+        }
+        */
+    }
 }
 
@@ -386 +412 @@
          return;
     }
-    mural->gX = x;
-    mural->gY = y;
-
-    Pos.x = x;
-    Pos.y = y;
-
-    CrVrScrCompositorLock(&mural->Compositor);
-    CrVrScrCompositorEntryPosSet(&mural->Compositor, &mural->CEntry, &Pos);
-    CrVrScrCompositorUnlock(&mural->Compositor);
-
-    crServerCheckMuralGeometry(mural);
+    if (mural->gX != x || mural->gY != y)
+    {
+        if (mural->fUseFBO != CR_SERVER_REDIR_NONE)
+        {
+            /* since we're going to change the current compositor & the window we need to avoid
+             * renderspu fron dealing with inconsistent data, i.e. modified compositor and
+             * still unmodified window.
+             * So what we do is:
+             * 1. tell renderspu to stop using the current compositor -> renderspu would do necessary synchronization with its redraw thread to ensure compositor is no longer used
+             * 2. do necessary modifications
+             * 3. re-set the compositor */
+
+            /* 1. tell renderspu to stop using the current compositor (see above comment) */
+            cr_server.head_spu->dispatch_table.VBoxPresentComposition(mural->spuWindow, NULL, NULL);
+        }
+
+        /* 2. do necessary modifications (see above comment) */
+        /* NOTE: we can do it even if mural->fUseFBO == CR_SERVER_REDIR_NONE to make sure the compositor data is always up to date */
+        Pos.x = x;
+        Pos.y = y;
+
+        /* the compositor lock is not needed actually since we have prevented renderspu from using the compositor */
+        /* CrVrScrCompositorLock(&mural->Compositor); */
+        CrVrScrCompositorEntryPosSet(&mural->Compositor, &mural->CEntry, &Pos);
+        /*CrVrScrCompositorUnlock(&mural->Compositor);*/
+
+        mural->gX = x;
+        mural->gY = y;
+
+        crServerCheckMuralGeometry(mural);
+
+        /* 3. re-set the compositor (see above comment) */
+        if (mural->fUseFBO != CR_SERVER_REDIR_NONE)
+        {
+            cr_server.head_spu->dispatch_table.VBoxPresentComposition(mural->spuWindow, &mural->Compositor, &mural->CEntry);
+        }
+    }
 }
 
@@ -410 +462 @@
     }
 
+    if (mural->fUseFBO != CR_SERVER_REDIR_NONE)
+    {
+        /* since we're going to change the current compositor & the window we need to avoid
+         * renderspu fron dealing with inconsistent data, i.e. modified compositor and
+         * still unmodified window.
+         * So what we do is:
+         * 1. tell renderspu to stop using the current compositor -> renderspu would do necessary synchronization with its redraw thread to ensure compositor is no longer used
+         * 2. do necessary modifications
+         * 3. re-set the compositor */
+
+        /* 1. tell renderspu to stop using the current compositor (see above comment) */
+        cr_server.head_spu->dispatch_table.VBoxPresentComposition(mural->spuWindow, NULL, NULL);
+    }
+
+    /* 2. do necessary modifications (see above comment) */
+    /* NOTE: we can do it even if mural->fUseFBO = CR_SERVER_REDIR_NONE 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); */
+    CrVrScrCompositorEntryRegionsSet(&mural->Compositor, &mural->CEntry, NULL, cRects, (const RTRECT *)pRects);
+    /*CrVrScrCompositorUnlock(&mural->Compositor);*/
+
     if (mural->pVisibleRects)
     {
@@ -437 +510 @@
     }
 
-    CrVrScrCompositorLock(&mural->Compositor);
-    CrVrScrCompositorEntryRegionsSet(&mural->Compositor, &mural->CEntry, NULL, cRects, (const RTRECT *)pRects);
-    CrVrScrCompositorUnlock(&mural->Compositor);
+    /* 3. re-set the compositor (see above comment) */
+    if (mural->fUseFBO != CR_SERVER_REDIR_NONE)
+    {
+        cr_server.head_spu->dispatch_table.VBoxPresentComposition(mural->spuWindow, &mural->Compositor, &mural->CEntry);
+    }
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c

@@ -589 +589 @@
     if (window) {
         renderspuVBoxCompositorSet( window, pCompositor);
-        /* renderspuVBoxPresentComposition can be invoked from the chromium thread only and is not reentrant,
-         * no need to acquire a compositor lock here */
-        renderspu_SystemVBoxPresentComposition(window, pCompositor, pChangedEntry);
+        if (pCompositor)
+        {
+            renderspu_SystemVBoxPresentComposition(window, pCompositor, pChangedEntry);
+        }
     }
     else {