From e702a9401d4564c970ddda71116d14d7661dd048 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 9 Jan 2012 13:49:53 +0100 Subject: Fix bug 548 and bug 533 - OSX [10.6] NVidia driver may require glFinish() before ctx release. --- src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/jogl/classes/jogamp/opengl') diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java index 77da2650f..0dd1a460e 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java @@ -532,6 +532,7 @@ public abstract class MacOSXCGLContext extends GLContextImpl } public boolean release(long ctx) { + gl.glFinish(); // w/o glFinish() OSX < 10.7 (NVidia driver) may freeze final boolean res = CGL.clearCurrentContext(ctx); final long cglCtx = CGL.getCGLContext(ctx); if(0 == cglCtx) { @@ -635,6 +636,7 @@ public abstract class MacOSXCGLContext extends GLContextImpl } public boolean release(long ctx) { + gl.glFinish(); // w/o glFinish() OSX < 10.7 (NVidia driver) may freeze int err = CGL.CGLSetCurrentContext(0); if(DEBUG && CGL.kCGLNoError != err) { System.err.println("CGL: Could not release current context: err 0x"+Integer.toHexString(err)+": "+this); -- cgit v1.2.3