Changeset 48084 in vbox for trunk/src/VBox

Timestamp:

Aug 27, 2013 2:43:29 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL/OSX: fix presentation with no-context-set views

File:

• trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m (modified) (9 diffs)

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

@@ -177 +177 @@
 
 
-static NSOpenGLContext * vboxCtxGetCurrent()
-{
-        GET_CONTEXT(pCtxInfo);
-        if (pCtxInfo)
-        {
-#ifdef DEBUG
-                NSOpenGLContext *pDbgCur = [NSOpenGLContext currentContext];
-                Assert(pCtxInfo->context == pDbgCur);
-                if (pDbgCur)
-                {
-                        NSView *pDbgView = [pDbgCur view];
-                        Assert(pCtxInfo->currentWindow->window == pDbgView);
-                }
-#endif
-                return pCtxInfo->context;
-        }
-
-#ifdef DEBUG
-        {
-                NSOpenGLContext *pDbgCur = [NSOpenGLContext currentContext];
-                Assert(!pDbgCur);
-        }
-#endif
-        return nil;
+static bool vboxCtxSyncCurrentInfo()
+{
+    GET_CONTEXT(pCtxInfo);
+    NSOpenGLContext *pCtx = [NSOpenGLContext currentContext];
+    NSView *pView = pCtx ? [pCtx view] : nil;
+    bool fAdjusted = false;
+    if (pCtxInfo)
+    {
+        WindowInfo *pWinInfo = pCtxInfo->currentWindow;
+        Assert(pWinInfo);
+        if (pCtxInfo->context != pCtx
+            || pWinInfo->window != pView)
+        {
+            renderspu_SystemMakeCurrent(pWinInfo, 0, pCtxInfo);
+            fAdjusted = true;
+        }
+    }
+    else
+    {
+        if (pCtx)
+        {
+            [NSOpenGLContext clearCurrentContext];
+            fAdjusted = true;
+        }
+    }
+    
+    return fAdjusted;
 }
 
@@ -212 +215 @@
 static void vboxCtxEnter(NSOpenGLContext*pCtx, PVBOX_CR_RENDER_CTX_INFO pCtxInfo)
 {
-    NSOpenGLContext *pOldCtx = vboxCtxGetCurrent();
+    NSOpenGLContext *pOldCtx = [NSOpenGLContext currentContext];
     NSView *pOldView = (pOldCtx ? [pOldCtx view] : nil);
     NSView *pView = [pCtx view];
@@ -883 +886 @@
     /* have to rebind GL_TEXTURE_RECTANGLE_ARB as m_FBOTexId could be changed in updateFBO call */
     m_fNeedViewportUpdate = true;
-    pCurCtx = vboxCtxGetCurrent();
+    pCurCtx = [NSOpenGLContext currentContext];
     if (pCurCtx && pCurCtx == m_pGLCtx && (pCurView = [pCurCtx view]) == self)
     {
@@ -994 +997 @@
     
         vboxCtxLeave(&CtxInfo);
+        
+        vboxCtxSyncCurrentInfo();
     }
 }
@@ -1162 +1167 @@
         [self unlockFocus];
     }
+    else
+    {
+        [self setNeedsDisplay:YES];
+    }
 }
 
@@ -1170 +1179 @@
         if (m_pSharedGLCtx)
             {
+#if 0
+            /* tmp workaround to prevent potential deadlock:
+             * crOpenGL service thread does compositor lock acquire and calls cocoa NS methods that could synchronize on the GUI thread
+             * while here we do a reverse order: acquire compositor lock being in gui thread.
+             * this is why we do only try acquire and re-submit repaint event if compositor lock is busy */
+             VBOXVR_SCR_COMPOSITOR *pCompositor = NULL;
+            int rc = renderspuVBoxCompositorTryAcquire(m_pWinInfo, &pCompositor);
+            if (RT_SUCCESS(rc))
+            {
+                Assert(pCompositor);
+                [self vboxPresent:pCompositor];
+                renderspuVBoxCompositorRelease(m_pWinInfo);
+            }
+            else if (rc == VERR_SEM_BUSY)
+            {
+                /* re-issue to the gui thread */
+                [self setNeedsDisplay:YES];
+            }
+            else
+            {
+                /* this is somewhat we do not expect */
+                DEBUG_MSG(("renderspuVBoxCompositorTryAcquire failed rc %d", rc));
+            }
+#else
                 VBOXVR_SCR_COMPOSITOR *pCompositor = renderspuVBoxCompositorAcquire(m_pWinInfo);
                 if (pCompositor)
@@ -1176 +1209 @@
                                 renderspuVBoxCompositorRelease(m_pWinInfo);
                         }
+#endif
                 }
         [self unlockFocus];
+    }
+    else
+    {
+        [self setNeedsDisplay:YES];
     }
 }
@@ -1208 +1246 @@
     
     vboxCtxLeave(&CtxInfo);
+    
+    vboxCtxSyncCurrentInfo();
 }
 
@@ -1781 +1821 @@
 {
     NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
-    
-    /* view should not necesserily have a context set 
-     * @todo: check and set default shared one */
-
+    NSOpenGLContext *pCtx;
+    
+    /* view should not necesserily have a context set */
+    pCtx = [(OverlayView*)pView glCtx];
+    if (!pCtx)
+    {
+        ContextInfo * pCtxInfo = renderspuDefaultSharedContextAcquire();
+        if (!pCtxInfo)
+        {
+            DEBUG_WARN(("renderspuDefaultSharedContextAcquire returned NULL"));
+            
+            [pPool release];
+            return;
+        }
+        
+        pCtx = pCtxInfo->context;
+        
+        [(OverlayView*)pView setGLCtx:pCtx];
+    }
+    
     [(OverlayView*)pView presentComposition:pChangedEntry];