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

Timestamp:

Feb 21, 2013 2:56:31 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL/OSX: redraw impl

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• renderspu.h (modified) (1 diff)
• renderspu_cocoa.c (modified) (1 diff)
• renderspu_cocoa_helper.h (modified) (2 diffs)
• renderspu_cocoa_helper.m (modified) (18 diffs)

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

@@ -79 +79 @@
  * Window info
  */
-typedef struct {
+typedef struct WindowInfo {
     int x, y;
 //    int width, height;

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

@@ -83 +83 @@
 #endif /* __LP64__ */
 
-    cocoaViewCreate(&pWinInfo->window, pParentWin, pVisInfo->visAttribs);
+    cocoaViewCreate(&pWinInfo->window, pWinInfo, pParentWin, pVisInfo->visAttribs);
 
     if (fShowIt)

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

@@ -26 +26 @@
 RT_C_DECLS_BEGIN
 
+struct WindowInfo;
+
 ADD_COCOA_NATIVE_REF(NSView);
 ADD_COCOA_NATIVE_REF(NSOpenGLContext);
@@ -34 +36 @@
 
 /* View management */
-void cocoaViewCreate(NativeNSViewRef *ppView, NativeNSViewRef pParentView, GLbitfield fVisParams);
+void cocoaViewCreate(NativeNSViewRef *ppView, struct WindowInfo *pWinInfo, NativeNSViewRef pParentView, GLbitfield fVisParams);
 void cocoaViewReparent(NativeNSViewRef pView, NativeNSViewRef pParentView);
 void cocoaViewDestroy(NativeNSViewRef pView);

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

@@ -28 +28 @@
 
 #include <cr_vreg.h>
+
+#include "renderspu.h"
 
 /** @page pg_opengl_cocoa  OpenGL - Cocoa Window System Helper
@@ -161 +163 @@
     } \
     while(0);
-    
-static NSOpenGLContext *g_pVBoxCurrentContext = NULL;
-#ifdef DEBUG
-static NSView *g_pVBoxCurrentView = NULL;
-#endif
+
 
 static NSOpenGLContext * vboxCtxGetCurrent()
 {
-#ifdef DEBUG
-    if (g_pVBoxCurrentContext)
-    {
-        Assert(g_pVBoxCurrentView == [g_pVBoxCurrentContext view]);
-    }
-#endif
-    return g_pVBoxCurrentContext;
-}
-
-static void vboxCtxSetCurrent(NSOpenGLContext * pCtx)
-{
-        g_pVBoxCurrentContext = pCtx;
-        if (pCtx)
+        GET_CONTEXT(pCtxInfo);
+        if (pCtxInfo)
         {
 #ifdef DEBUG
-                g_pVBoxCurrentView = [g_pVBoxCurrentContext view];
+                NSOpenGLContext *pDbgCur = [NSOpenGLContext currentContext];
+                Assert(pCtxInfo->context == pDbgCur);
+                if (pDbgCur)
+                {
+                        NSView *pDbgView = [pDbgCur view];
+                        Assert(pCtxInfo->currentWindow->window == pDbgView);
+                }
 #endif
-                [pCtx makeCurrentContext];
+                return pCtxInfo->context;
         }
-        else
+
+#ifdef DEBUG
         {
-#ifdef DEBUG
-                g_pVBoxCurrentView = NULL;
+                NSOpenGLContext *pDbgCur = [NSOpenGLContext currentContext];
+                Assert(!pDbgCur);
+        }
 #endif
-                [NSOpenGLContext clearCurrentContext];
-        }
+        return nil;
 }
 
@@ -252 +246 @@
     NSPoint          m_RootShift;
     
-    PVBOXVR_SCR_COMPOSITOR m_pCompositor;
+    WindowInfo *m_pWinInfo;
+    PVBOXVR_SCR_COMPOSITOR m_pCompositor; 
     bool m_fNeedViewportUpdate;
     bool m_fNeedCtxUpdate;
 }
-- (id)initWithFrame:(NSRect)frame thread:(RTTHREAD)aThread parentView:(NSView*)pParentView;
+- (id)initWithFrame:(NSRect)frame thread:(RTTHREAD)aThread parentView:(NSView*)pParentView winInfo:(WindowInfo*)pWinInfo;
 - (void)setGLCtx:(NSOpenGLContext*)pCtx;
 - (NSOpenGLContext*)glCtx;
@@ -277 +272 @@
 - (void)makeCurrentFBO;
 - (void)swapFBO;
-- (void)tryDraw;
+- (void)vboxTryDraw;
+- (void)vboxTryDrawUI;
 - (void)vboxPresent;
 - (void)vboxPresentCS;
@@ -665 +661 @@
 @implementation OverlayView
 
-- (id)initWithFrame:(NSRect)frame thread:(RTTHREAD)aThread parentView:(NSView*)pParentView
+- (id)initWithFrame:(NSRect)frame thread:(RTTHREAD)aThread parentView:(NSView*)pParentView winInfo:(WindowInfo*)pWinInfo
 {
     m_pParentView             = pParentView;
@@ -678 +674 @@
     m_Size                    = NSMakeSize(1, 1);
     m_RootShift               = NSZeroPoint;
-    m_pCompositor             = NULL;
+    m_pWinInfo                    = pWinInfo;
+    m_pCompositor             = nil;
     m_fNeedViewportUpdate     = true;        
     m_fNeedCtxUpdate          = true;
@@ -724 +721 @@
 - (void)drawRect:(NSRect)aRect
 {
-    /* Do nothing */
+    [self vboxTryDrawUI];
 }
 
@@ -776 +773 @@
 
     [self reshape];
+    
+    [self vboxTryDraw];
 }
 
@@ -943 +942 @@
         */
         {
-            vboxCtxSetCurrent(m_pGLCtx);
+            [m_pGLCtx makeCurrentContext];
             CHECK_GL_ERROR();
             if (m_fNeedCtxUpdate == true)
@@ -961 +960 @@
 }
 
-- (void)tryDraw
-{
+- (void)vboxTryDraw
+{
+    GLint opaque       = 0;
     if ([self lockFocusIfCanDraw])
     {
-        [self vboxPresent];
+        bool fCompositorAquired = false;
+        if (!m_pSharedGLCtx)
+            {
+                m_pCompositor = renderspuVBoxCompositorAcquire(m_pWinInfo);
+                if (m_pCompositor)
+                {
+                    fCompositorAquired = true;
+                        /* Create a shared context out of the main context. Use the same pixel format. */
+                        m_pSharedGLCtx = [[NSOpenGLContext alloc] initWithFormat:[(OverlayOpenGLContext*)m_pGLCtx openGLPixelFormat] shareContext:m_pGLCtx];
+                
+                        /* Set the new context as non opaque */
+                        [m_pSharedGLCtx setValues:&opaque forParameter:NSOpenGLCPSurfaceOpacity];
+                        /* Set this view as the drawable for the new context */
+                        [m_pSharedGLCtx setView: self];
+                        m_fNeedViewportUpdate = true;
+                    }
+                }
+                
+                if (m_pSharedGLCtx)
+                {
+                        if (!fCompositorAquired)
+                        {
+                                /* we do not want to be blocked with the GUI thread here, so only draw her eif we are really able to do that w/o bllocking */
+                                int rc = renderspuVBoxCompositorTryAcquire(m_pWinInfo, &m_pCompositor);
+                                if (RT_SUCCESS(rc))
+                                {
+                                        fCompositorAquired = true;
+                                }
+                            else if (rc != VERR_SEM_BUSY)
+                            {
+                                glFlush();
+                                /* issue to the gui thread */
+                                [self setNeedsDisplay:YES];
+                            }
+                            else
+                            {
+                                /* this is somewhat we do not expect */
+                                DEBUG_MSG(("renderspuVBoxCompositorTryAcquire failed rc %d", rc));
+                            }
+                        }
+                        
+                        if (fCompositorAquired)
+                        {
+                                Assert(m_pCompositor);
+                                [self vboxPresent];
+                                renderspuVBoxCompositorRelease(m_pWinInfo);
+                        }
+                }
+                else
+                {
+                        AssertRelease(!fCompositorAquired);
+                }
         [self unlockFocus];
     }
 }
 
+- (void)vboxTryDrawUI
+{
+    if ([self lockFocusIfCanDraw])
+    {
+        if (m_pSharedGLCtx)
+            {
+                m_pCompositor = renderspuVBoxCompositorAcquire(m_pWinInfo);
+                if (m_pCompositor)
+                {
+                        [self vboxPresent];
+                                renderspuVBoxCompositorRelease(m_pWinInfo);
+                        }
+                }
+        [self unlockFocus];
+    }
+}
+
 - (void)swapFBO
 {
@@ -977 +1045 @@
 - (void)vboxPresent
 {
-    GLint opaque       = 0;
-
     DEBUG_MSG(("OVIW(%p): renderFBOToView\n", (void*)self));
     
-    if (!m_pCompositor)
-        return;
-
-#ifdef DEBUG
-            {
-                NSOpenGLContext *pTstOldCtx = [NSOpenGLContext currentContext];
-                NSView *pTstOldView = (pTstOldCtx ? [pTstOldCtx view] : nil);
-                Assert(pTstOldCtx == m_pGLCtx);
-                Assert(pTstOldView == self);
-            }
-#endif
-
-    if (!m_pSharedGLCtx)
-    {
-        /* Create a shared context out of the main context. Use the same pixel format. */
-        m_pSharedGLCtx = [[NSOpenGLContext alloc] initWithFormat:[(OverlayOpenGLContext*)m_pGLCtx openGLPixelFormat] shareContext:m_pGLCtx];
-
-        /* Set the new context as non opaque */
-        [m_pSharedGLCtx setValues:&opaque forParameter:NSOpenGLCPSurfaceOpacity];
-        /* Set this view as the drawable for the new context */
-        [m_pSharedGLCtx setView: self];
-        m_fNeedViewportUpdate = true;
-    }
+    Assert(m_pCompositor);
     
-#ifdef DEBUG
+#if 0 //def DEBUG
             {
                 NSOpenGLContext *pTstOldCtx = [NSOpenGLContext currentContext];
@@ -1103 +1147 @@
     bool fNeedCtxSwitch = (pOldCtx != pCtx || pOldView != pView);
     Assert(pCtx);
-    Assert(pOldCtx == m_pGLCtx);
-    Assert(pOldView == self);
-    Assert(fNeedCtxSwitch);
+ //   Assert(pOldCtx == m_pGLCtx);
+ //   Assert(pOldView == self);
+ //   Assert(fNeedCtxSwitch);
     if (fNeedCtxSwitch)
     {
@@ -1111 +1155 @@
             glFlush();
         
-        vboxCtxSetCurrent(pCtx);
+        [pCtx makeCurrentContext];
     }
     
@@ -1126 +1170 @@
             }
         
-                vboxCtxSetCurrent(pOldCtx);
+                [pOldCtx makeCurrentContext];
             
 #ifdef DEBUG
@@ -1146 +1190 @@
 - (void)presentComposition:(PVBOXVR_SCR_COMPOSITOR)pCompositor withChangedEntry:(PVBOXVR_SCR_COMPOSITOR_ENTRY)pChangedEntry
 {
-    m_pCompositor = pCompositor;
-    
-    [self tryDraw];
+    [self vboxTryDraw];
 }
 
@@ -1278 +1320 @@
         memcpy(m_paClipRects, paRects, sizeof(GLint) * 4 * cRects);
     }
-#if 0
-    /* todo: handle pending m_fNeedCtxUpdate */
-    else if (cOldRects)
-        [self tryDraw];
-#endif
+
+    [self vboxTryDraw];
 }
 
@@ -1431 +1470 @@
 *
 ********************************************************************************/
-void cocoaViewCreate(NativeNSViewRef *ppView, NativeNSViewRef pParentView, GLbitfield fVisParams)
+void cocoaViewCreate(NativeNSViewRef *ppView, WindowInfo *pWinInfo, NativeNSViewRef pParentView, GLbitfield fVisParams)
 {
     NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
 
     /* Create our worker view */
-    OverlayView* pView = [[OverlayView alloc] initWithFrame:NSZeroRect thread:RTThreadSelf() parentView:pParentView];
+    OverlayView* pView = [[OverlayView alloc] initWithFrame:NSZeroRect thread:RTThreadSelf() parentView:pParentView winInfo:pWinInfo];
 
     if (pView)
@@ -1600 +1639 @@
     else
     {
-        vboxCtxSetCurrent(NULL);
+        [NSOpenGLContext clearCurrentContext];
     }