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

Timestamp:

Nov 9, 2009 11:17:15 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL-OSX: better fix for r54567

File:

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

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

@@ -897 +897 @@
 
 #ifdef FBO
-    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_FBOId);
+    if([NSOpenGLContext currentContext] != 0)
+        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_FBOId);
 #endif
     if (m_pGLCtx)
@@ -904 +905 @@
         {
             /* We change the active view, so flush first */
-            glFlush();
+            if([NSOpenGLContext currentContext] != 0)
+                glFlush();
             [m_pGLCtx setView: self];
             CHECK_GL_ERROR();
@@ -1367 +1369 @@
     NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
 
-    if ([NSOpenGLContext currentContext] != pCtx)
-        [pCtx makeCurrentContext];
-
     [(OverlayView*)pView setGLCtx:pCtx];
     [(OverlayView*)pView makeCurrentFBO];