Changeset 54638 in vbox for trunk/src/VBox

Timestamp:

Mar 5, 2015 12:33:47 AM (10 years ago)

Author:

vboxsync

Message:

Looks like we have to do glFlush() before changing GL context on mac os x.

Location:

trunk/src/VBox

Files:

• Devices/Graphics/DevVGA-SVGA3d-cocoa.m (modified) (1 diff)
• HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m (modified) (8 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-cocoa.m

@@ -735 +735 @@
     DEBUG_MSG(("cocoaViewMakeCurrentContext(%p, %p)\n", (void*)pView, (void*)pCtx));
 
+    /* Always flush before flush. glXMakeCurrent and wglMakeCurrent does this
+       implicitly, seemingly NSOpenGLContext::makeCurrentContext doesn't. */
+    if ([NSOpenGLContext currentContext] != 0)
+        glFlush();
+
     if (pView)
     {

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

@@ -193 +193 @@
     } while (0)
 
-#ifdef DEBUG_poetzsch
-# define DEBUG_CHECK_GL_ERROR() do { checkGLError(__FILE__, __LINE__); } while (0);
-static void checkGLError(char *pszFile, int iLine)
-{
-    GLenum uGlErr = glGetError();
-    if (uGlErr != GL_NO_ERROR)
-    {
-        const char *errStr;
-        switch (uGlErr)
-        {
-            case GL_INVALID_ENUM:      errStr = "GL_INVALID_ENUM"; break;
-            case GL_INVALID_VALUE:     errStr = "GL_INVALID_VALUE"; break;
-            case GL_INVALID_OPERATION: errStr = "GL_INVALID_OPERATION"; break;
-            case GL_STACK_OVERFLOW:    errStr = "GL_STACK_OVERFLOW"; break;
-            case GL_STACK_UNDERFLOW:   errStr = "GL_STACK_UNDERFLOW"; break;
-            case GL_OUT_OF_MEMORY:     errStr = "GL_OUT_OF_MEMORY"; break;
-            case GL_TABLE_TOO_LARGE:   errStr = "GL_TABLE_TOO_LARGE"; break;
-            default:                   errStr = "UNKNOWN"; break;
-        }
-        DEBUG_MSG(("%s:%d: glError %d (%s)\n", pszFile, iLine, uGlErr, errStr));
-    }
-}
+#ifdef VBOX_STRICT
+# define DEBUG_CLEAR_GL_ERRORS() \
+    do { \
+        while (glGetError() != GL_NO_ERROR) \
+        { /* nothing */ } \
+    } while (0)
+# define DEBUG_CHECK_GL_ERROR(a_szOp) \
+    do { \
+        GLenum iGlCheckErr = glGetError(); \
+        if (RT_UNLIKELY(iGlCheckErr != GL_NO_ERROR)) \
+            AssertMsgFailed((a_szOp ": iGlCheckErr=%#x\n", iGlCheckErr)); \
+    } while (0) 
 #else
-# define DEBUG_CHECK_GL_ERROR() do {} while (0)
+# define DEBUG_CLEAR_GL_ERRORS()        do {} while (0)
+# define DEBUG_CHECK_GL_ERROR(a_szOp)   do {} while (0)
 #endif
 
@@ -389 +380 @@
             glFlush();
         
+        DEBUG_CLEAR_GL_ERRORS();
         [pNewCtx makeCurrentContext];
+        DEBUG_CHECK_GL_ERROR("makeCurrentContext");
         
         pCtxInfo->fIsValid = true;
@@ -420 +413 @@
             if ([pOldCtx view] != pOldView) 
             {
+                DEBUG_CLEAR_GL_ERRORS();
                 [pOldCtx setView: pOldView];
+                DEBUG_CHECK_GL_ERROR("setView");
             }
         
+            DEBUG_CLEAR_GL_ERRORS();
             [pOldCtx makeCurrentContext];
+            DEBUG_CHECK_GL_ERROR("makeCurrentContext");
             
 #ifdef VBOX_STRICT
@@ -1497 +1494 @@
         if (m_pGLCtx)
         {
+#ifdef IN_VMSVGA3D
+            Assert(!pCtx);
+#endif
             [m_pGLCtx clearDrawable];
             [m_pGLCtx release];
@@ -2000 +2000 @@
 - (void)makeCurrentFBO
 {
-    COCOA_LOG_FLOW(("%s: self=%p\n", __PRETTY_FUNCTION__, (void *)self));
+    COCOA_LOG_FLOW(("%s: self=%p - m_pGLCtx=%p m_fNeedCtxUpdate=%d\n", __PRETTY_FUNCTION__, (void *)self, 
+                    (void *)m_pGLCtx, m_fNeedCtxUpdate));
 
     if (m_pGLCtx)
     {
+        NSOpenGLContext *pPrevCtx = [NSOpenGLContext currentContext];
+
+#ifdef IN_VMSVGA3D
+        /* Always flush before flush. glXMakeCurrent and wglMakeCurrent does this
+           implicitly, seemingly NSOpenGLContext::makeCurrentContext doesn't. */
+        if (pPrevCtx != nil)
+        {
+            DEBUG_CLEAR_GL_ERRORS();
+            glFlush();
+            DEBUG_CHECK_GL_ERROR("glFlush");
+        }
+#endif
+
         if ([m_pGLCtx view] != self)
         {
+#ifndef IN_VMSVGA3D
             /* We change the active view, so flush first */
-            if ([NSOpenGLContext currentContext] != 0)
+            if (pPrevCtx != nil)
                 glFlush();
+#endif
+            DEBUG_CLEAR_GL_ERRORS();
             [m_pGLCtx setView: self];
-            DEBUG_CHECK_GL_ERROR();
+            DEBUG_CHECK_GL_ERROR("setView");
         }
 
-        /*
-        if ([NSOpenGLContext currentContext] != m_pGLCtx)
-        */
+#if 0
+        if (pPrevCtx != m_pGLCtx)
+#endif
         {
+            DEBUG_CLEAR_GL_ERRORS();
             [m_pGLCtx makeCurrentContext];
-            DEBUG_CHECK_GL_ERROR();
-            if (m_fNeedCtxUpdate == true)
-            {
-                [m_pGLCtx update];
-                m_fNeedCtxUpdate = false;
-            }
+            DEBUG_CHECK_GL_ERROR("makeCurrentContext");
+            Assert([NSOpenGLContext currentContext] == m_pGLCtx);
+            Assert([m_pGLCtx view] == self);
+        }
+
+        if (m_fNeedCtxUpdate == true)
+        {
+            [m_pGLCtx update];
+            m_fNeedCtxUpdate = false;
         }
         
@@ -2851 +2872 @@
 
     [pPool release];
-    COCOA_LOG_FLOW(("cocoaGLCtxDestroy: returns *ppCtx=%p\n", (void *)*ppCtx));
+    COCOA_LOG_FLOW(("cocoaGLCtxCreate: returns *ppCtx=%p\n", (void *)*ppCtx));
 }
 
@@ -3131 +3152 @@
     else
     {
+#ifdef IN_VMSVGA3D
+        /* Always flush before flush. glXMakeCurrent and wglMakeCurrent does this
+           implicitly, seemingly NSOpenGLContext::makeCurrentContext doesn't. */
+        if ([NSOpenGLContext currentContext] != nil)
+        {
+            DEBUG_CLEAR_GL_ERRORS();
+            glFlush();
+            DEBUG_CHECK_GL_ERROR("glFlush");
+        }
+#endif
         [NSOpenGLContext clearCurrentContext];
     }
@@ -3207 +3238 @@
 VMSVGA3D_DECL(void) vmsvga3dCocoaViewMakeCurrentContext(NativeNSViewRef pView, NativeNSOpenGLContextRef pCtx)
 {
+    Assert(!pView || [(OverlayView *)pView glCtx] == pCtx || [(OverlayView *)pView glCtx] == nil);
     cocoaViewMakeCurrentContext(pView, pCtx);
 }