Changeset 45066 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_window.c

Timestamp:

Mar 18, 2013 5:08:39 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: misc bugfixes & cleanups

File:

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

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

@@ -31 +31 @@
         return -1;
     }
-
-    mural->fCompositorPresented = GL_FALSE;
 
     /*
@@ -332 +330 @@
         Tex.hwid = 0;
 
-        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) */
-            crServerVBoxCompositionDisable(mural);
-        }
-
-        mural->fCompositorPresented = GL_FALSE;
+
+        /* 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) */
+        crServerVBoxCompositionDisable(mural);
 
         /* 2. do necessary modifications (see above comment) */
@@ -377 +371 @@
         /* 3. (so far not needed for resize, but in case it is in the future) re-set the compositor (see above comment) */
         /* uncomment when needed */
-        /* NOTE: !!! we have mural->fCompositorPresented set to GL_FALSE above, so crServerVBoxCompositionReenable will have no effect in any way
-        if (mural->fUseFBO != CR_SERVER_REDIR_NONE)
-        {
-            crServerVBoxCompositionReenable(mural);
-        }
+        /* NOTE: !!! we have mural->fHasPresentationData set to GL_FALSE above, so crServerVBoxCompositionReenable will have no effect in any way
+        crServerVBoxCompositionReenable(mural);
         */
     }
@@ -423 +414 @@
 //    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) */
-            crServerVBoxCompositionDisable(mural);
-        }
-
-        /* 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); */
-        /* no need to set position because the position is relative to window */
-        /*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)
-        {
-            crServerVBoxCompositionReenable(mural, false);
-        }
-    }
-}
-
-void SERVER_DISPATCH_APIENTRY
-crServerDispatchWindowVisibleRegion( GLint window, GLint cRects, GLint *pRects )
-{
-    CRMuralInfo *mural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, window);
-    bool fContainedRegions;
-    if (!mural) {
-#if EXTRA_WARN
-         crWarning("CRServer: invalid window %d passed to WindowVisibleRegion()", window);
-#endif
-         return;
-    }
-
-    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
@@ -485 +424 @@
         /* 1. tell renderspu to stop using the current compositor (see above comment) */
         crServerVBoxCompositionDisable(mural);
-    }
-
-    fContainedRegions = !CrVrScrCompositorIsEmpty(&mural->Compositor);
+
+        /* 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); */
+        /* no need to set position because the position is relative to window */
+        /*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) */
+        crServerVBoxCompositionReenable(mural, GL_FALSE);
+    }
+}
+
+void SERVER_DISPATCH_APIENTRY
+crServerDispatchWindowVisibleRegion( GLint window, GLint cRects, GLint *pRects )
+{
+    CRMuralInfo *mural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, window);
+    GLboolean fForcePresent = crServerVBoxCompositionPresentNeeded(mural);
+    if (!mural) {
+#if EXTRA_WARN
+         crWarning("CRServer: invalid window %d passed to WindowVisibleRegion()", window);
+#endif
+         return;
+    }
+
+    /* 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) */
+    crServerVBoxCompositionDisable(mural);
+
     /* 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 */
@@ -523 +504 @@
 
     /* 3. re-set the compositor (see above comment) */
-    if (mural->fUseFBO != CR_SERVER_REDIR_NONE)
-    {
-        crServerVBoxCompositionReenable(mural, fContainedRegions && CrVrScrCompositorIsEmpty(&mural->Compositor));
-    }
-}
-
-
+    crServerVBoxCompositionReenable(mural, fForcePresent);
+}
 
 void SERVER_DISPATCH_APIENTRY