Changeset 51442 in vbox for trunk/src/VBox/HostServices

Timestamp:

May 28, 2014 11:09:30 AM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: fix flickering on osx

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserverlib/server_presenter.cpp (modified) (1 diff)
• render/renderspu.c (modified) (7 diffs)
• render/renderspu.h (modified) (3 diffs)
• render/renderspu_agl.c (modified) (1 diff)
• render/renderspu_cocoa.c (modified) (1 diff)
• render/renderspu_cocoa_helper.h (modified) (1 diff)
• render/renderspu_cocoa_helper.m (modified) (13 diffs)
• render/renderspu_glx.c (modified) (1 diff)
• render/renderspu_wgl.c (modified) (1 diff)

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

@@ -2501 +2501 @@
             {
                 mFlags.fForcePresentOnReenable = false;
-                cr_server.head_spu->dispatch_table.VBoxPresentComposition(mSpuWindow, mpCompositor, NULL);
+                if (mpCompositor)
+                    cr_server.head_spu->dispatch_table.VBoxPresentComposition(mSpuWindow, mpCompositor, NULL);
+                else
+                {
+                    VBOXVR_SCR_COMPOSITOR TmpCompositor;
+                    RTRECT Rect;
+                    Rect.xLeft = 0;
+                    Rect.yTop = 0;
+                    Rect.xRight = mWidth;
+                    Rect.yBottom = mHeight;
+                    CrVrScrCompositorInit(&TmpCompositor, &Rect);
+                    /* this is a cleanup operation
+                     * empty compositor is guarantid to be released on VBoxPresentComposition return */
+                    cr_server.head_spu->dispatch_table.VBoxPresentComposition(mSpuWindow, mpCompositor, NULL);
+                }
                 g_pLed->Asserted.s.fWriting = 1;
             }

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

@@ -450 +450 @@
     crMemset(window, 0, sizeof (*window));
     RTCritSectInit(&window->CompositorLock);
-    window->fCompositorPresentEmpty = GL_FALSE;
     window->pCompositor = NULL;
 
@@ -777 +776 @@
     window = (WindowInfo *) crHashtableSearch(render_spu.windowTable, win);
     if (window) {
-        if (pCompositor && CrVrScrCompositorIsEmpty(pCompositor) && !window->fCompositorPresentEmpty)
-            pCompositor = NULL;
-
-        if (pCompositor)
-            window->fCompositorPresentEmpty = GL_FALSE;
-
-        renderspuVBoxCompositorSet( window, pCompositor);
-        if (pCompositor)
+        if (renderspuVBoxCompositorSet(window, pCompositor))
         {
             renderspu_SystemVBoxPresentComposition(window, pChangedEntry);
@@ -1016 +1008 @@
 }
 
-void renderspuVBoxCompositorSet( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR * pCompositor)
+GLboolean renderspuVBoxCompositorSet( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR * pCompositor)
 {
     int rc;
+    GLboolean fEmpty = pCompositor && CrVrScrCompositorIsEmpty(pCompositor);
+    GLboolean fNeedPresent;
+
     /* renderspuVBoxCompositorSet can be invoked from the chromium thread only and is not reentrant,
      * no need to synch here
      * the lock is actually needed to ensure we're in synch with the redraw thread */
-    if (window->pCompositor == pCompositor)
-        return;
+    if (window->pCompositor == pCompositor && ! fEmpty)
+        return !!pCompositor;
+
     rc = RTCritSectEnter(&window->CompositorLock);
     if (RT_SUCCESS(rc))
     {
+        if (!fEmpty)
+            fNeedPresent = !!pCompositor;
+        else
+        {
+            fNeedPresent = renderspu_SystemWindowNeedEmptyPresent(window);
+            pCompositor = NULL;
+        }
+
         window->pCompositor = pCompositor;
         RTCritSectLeave(&window->CompositorLock);
-        return;
+        return fNeedPresent;
     }
     else
     {
-        crWarning("RTCritSectEnter failed rc %d", rc);
-    }
+        WARN(("RTCritSectEnter failed rc %d", rc));
+    }
+
+    return GL_FALSE;
 }
 
@@ -1060 +1066 @@
         const VBOXVR_SCR_COMPOSITOR * pCompositor = window->pCompositor;
         if (pCompositor)
+        {
+            Assert(!CrVrScrCompositorIsEmpty(window->pCompositor));
             return pCompositor;
+        }
 
         /* if no compositor is set, release the lock and return */
@@ -1072 +1081 @@
 }
 
-int renderspuVBoxCompositorLock(WindowInfo *window)
+int renderspuVBoxCompositorLock(WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR **ppCompositor)
 {
     int rc = RTCritSectEnter(&window->CompositorLock);
-    AssertRC(rc);
+    if (RT_SUCCESS(rc))
+    {
+        if (ppCompositor)
+            *ppCompositor = window->pCompositor;
+    }
+    else
+        WARN(("RTCritSectEnter failed %d", rc));
     return rc;
 }
@@ -1093 +1108 @@
         *ppCompositor = window->pCompositor;
         if (*ppCompositor)
+        {
+            Assert(!CrVrScrCompositorIsEmpty(window->pCompositor));
             return VINF_SUCCESS;
+        }
 
         /* if no compositor is set, release the lock and return */
@@ -1110 +1128 @@
     int rc;
     Assert(window->pCompositor);
-    if (CrVrScrCompositorIsEmpty(window->pCompositor) && RTCritSectGetRecursion(&window->CompositorLock) == 1)
-        window->pCompositor = NULL;
+    Assert(!CrVrScrCompositorIsEmpty(window->pCompositor));
     rc = RTCritSectLeave(&window->CompositorLock);
     if (!RT_SUCCESS(rc))

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

@@ -101 +101 @@
     GLboolean visible;
     GLboolean everCurrent; /**< has this window ever been bound? */
-    GLboolean fCompositorPresentEmpty;
     char *title;
 
@@ -400 +399 @@
 extern void renderspu_SystemWindowPosition( WindowInfo *window, GLint x, GLint y );
 extern void renderspu_SystemWindowVisibleRegion(WindowInfo *window, GLint cRects, const GLint* pRects);
+extern GLboolean renderspu_SystemWindowNeedEmptyPresent(WindowInfo *window);
 extern int renderspu_SystemInit();
 extern int renderspu_SystemTerm();
@@ -411 +411 @@
 extern void renderspu_GCWindow(void);
 extern int renderspuCreateFunctions( SPUNamedFunctionTable table[] );
-extern void renderspuVBoxCompositorSet( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR * pCompositor);
+extern GLboolean renderspuVBoxCompositorSet( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR * pCompositor);
 extern void renderspuVBoxCompositorClearAll();
-extern int renderspuVBoxCompositorLock(WindowInfo *window);
+extern int renderspuVBoxCompositorLock(WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR **ppCompositor);
 extern int renderspuVBoxCompositorUnlock(WindowInfo *window);
 extern const struct VBOXVR_SCR_COMPOSITOR * renderspuVBoxCompositorAcquire( WindowInfo *window);

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

@@ -704 +704 @@
 }
 
+GLboolean renderspu_SystemWindowNeedEmptyPresent(WindowInfo *window)
+{
+    return GL_FALSE;
+}
+
 void renderspu_SystemWindowVisibleRegion(WindowInfo *window, GLint cRects, const GLint* pRects)
 {

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

@@ -180 +180 @@
 }
 
+GLboolean renderspu_SystemWindowNeedEmptyPresent(WindowInfo *pWinInfo)
+{
+    return cocoaViewNeedsEmptyPresent(pWinInfo->window);
+}
+
 void renderspu_SystemWindowVisibleRegion(WindowInfo *pWinInfo, GLint cRects, const GLint* paRects)
 {

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.h

@@ -49 +49 @@
 void cocoaViewMakeCurrentContext(NativeNSViewRef pView, NativeNSOpenGLContextRef pCtx);
 void cocoaViewSetVisibleRegion(NativeNSViewRef pView, GLint cRects, const GLint* paRects);
+GLboolean cocoaViewNeedsEmptyPresent(NativeNSViewRef pView);
 void cocoaViewPresentComposition(NativeNSViewRef pView, const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry);
 

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m

@@ -349 +349 @@
     bool m_fNeedCtxUpdate;
     bool m_fDataVisible;
+    bool m_fCleanupNeeded;
     bool m_fEverSized;
 }
@@ -386 +387 @@
 - (void)clearVisibleRegions;
 - (void)setVisibleRegions:(GLint)cRects paRects:(const GLint*)paRects;
+- (GLboolean)vboxNeedsEmptyPresent;
 
 - (NSView*)dockTileScreen;
@@ -796 +798 @@
     m_fNeedCtxUpdate          = true;
     m_fDataVisible            = false;
+    m_fCleanupNeeded          = false;
     m_fEverSized              = false;
     
@@ -900 +903 @@
     if (m_fEverSized)
         [self performSelectorOnMainThread:@selector(vboxReshapePerform) withObject:nil waitUntilDone:NO];
-    
-    /* we need to redwar on regions change, however the compositor now is cleared 
-     * because all compositor&window data-related modifications are performed with compositor cleared
-     * the renderspu client will re-set the compositor after modifications are complete
-     * this way we indicate renderspu generic code not to ignore the empty compositor */
-     /* generally this should not be needed for setPos because compositor should not be zeroed with it,
-      * in any way setting this flag here should not hurt as it will be re-set on next present */
-    m_pWinInfo->fCompositorPresentEmpty = GL_TRUE;
 }
 
@@ -930 +925 @@
     DEBUG_MSG(("OVIW(%p): setSize: new size: %dx%d\n", (void*)self, (int)size.width, (int)size.height));
     [self performSelectorOnMainThread:@selector(vboxReshapeOnResizePerform) withObject:nil waitUntilDone:NO];
-
-    /* we need to redwar on regions change, however the compositor now is cleared 
-     * because all compositor&window data-related modifications are performed with compositor cleared
-     * the renderspu client will re-set the compositor after modifications are complete
-     * this way we indicate renderspu generic code not to ignore the empty compositor */
-     /* generally this should not be needed for setSize because compositor should not be zeroed with it,
-      * in any way setting this flag here should not hurt as it will be re-set on next present */
-    m_pWinInfo->fCompositorPresentEmpty = GL_TRUE;
 }
 
@@ -1193 +1180 @@
 - (void)vboxTryDrawUI
 {
-    const VBOXVR_SCR_COMPOSITOR *pCompositor = renderspuVBoxCompositorAcquire(m_pWinInfo);
-    if (!m_fDataVisible && !pCompositor)
+    const VBOXVR_SCR_COMPOSITOR *pCompositor;
+    int rc = renderspuVBoxCompositorLock(m_pWinInfo, &pCompositor);
+    if (RT_FAILURE(rc))
+    {
+        DEBUG_WARN(("renderspuVBoxCompositorLock failed\n"));
         return;
+    }
+
+    if (!pCompositor && !m_fCleanupNeeded)
+    {
+        renderspuVBoxCompositorUnlock(m_pWinInfo);
+        return;
+    }
 
     VBOXVR_SCR_COMPOSITOR TmpCompositor;
@@ -1204 +1201 @@
         {
             Assert(!m_fDataVisible);
+            Assert(!m_fCleanupNeeded);
             renderspuVBoxCompositorRelease(m_pWinInfo);
             if (![self vboxSharedCtxCreate])
@@ -1215 +1213 @@
             pCompositor = renderspuVBoxCompositorAcquire(m_pWinInfo);
             Assert(!m_fDataVisible);
+            Assert(!m_fCleanupNeeded);
             if (!pCompositor)
                 return;
@@ -1221 +1220 @@
     else
     {
+        Assert(m_fCleanupNeeded);
         CrVrScrCompositorInit(&TmpCompositor, NULL);
         pCompositor = &TmpCompositor;
@@ -1235 +1235 @@
     }
     
-    if (pCompositor != &TmpCompositor)
-        renderspuVBoxCompositorRelease(m_pWinInfo);
+    renderspuVBoxCompositorUnlock(m_pWinInfo);
 }
 
@@ -1569 +1568 @@
 }
 
+- (GLboolean)vboxNeedsEmptyPresent
+{
+    if (m_fDataVisible)
+    {
+        m_fCleanupNeeded = true;
+        return GL_TRUE;
+    }
+    
+    return GL_FALSE;
+}
+
 - (void)setVisibleRegions:(GLint)cRects paRects:(const GLint*)paRects
 {
@@ -1589 +1599 @@
         memcpy(m_paClipRects, paRects, sizeof(GLint) * 4 * cRects);
     }
-
-    /* we need to redwar on regions change, however the compositor now is cleared 
-     * because all compositor&window data-related modifications are performed with compositor cleared
-     * the renderspu client will re-set the compositor after modifications are complete
-     * this way we indicate renderspu generic code not to ignore the empty compositor */
-    m_pWinInfo->fCompositorPresentEmpty = GL_TRUE;
 }
 
@@ -1938 +1942 @@
 }
 
+GLboolean cocoaViewNeedsEmptyPresent(NativeNSViewRef pView)
+{
+    NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
+
+    [(OverlayView*)pView vboxNeedsEmptyPresent];
+
+    [pPool release];
+}
+
 void cocoaViewSetVisibleRegion(NativeNSViewRef pView, GLint cRects, const GLint* paRects)
 {

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

@@ -1889 +1889 @@
 }
 
+GLboolean renderspu_SystemWindowNeedEmptyPresent(WindowInfo *window)
+{
+    return GL_FALSE;
+}
+
 void
 renderspu_SystemWindowVisibleRegion( WindowInfo *window, GLint cRects, const GLint *pRects )

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

@@ -1580 +1580 @@
 }
 
+GLboolean renderspu_SystemWindowNeedEmptyPresent(WindowInfo *window)
+{
+    return GL_FALSE;
+}
+
 void renderspu_SystemWindowVisibleRegion(WindowInfo *window, GLint cRects, const GLint* pRects)
 {