diff options
author | Sven Gothel <[email protected]> | 2011-10-13 13:02:32 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-10-13 13:02:32 +0200 |
commit | 5d33b0a3ef993ff2d257c90abc3d84bc93269cd0 (patch) | |
tree | b6a0a984ce20f8f57a37932476cde851ab31d72e /src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLContext.java | |
parent | a8c14db739c8d7765d1a204f73b5708faac07fdd (diff) |
MacOSX: Fix shared ctx release [onMainThread]; Make GLContextShareSet lifecycle deterministic; Remove warnings
Fix shared ctx release [onMainThread]
- Releasing the shared contexts caused a freeze of about 10s from one of the shared release operations.
[NSOpenGLContext release]
- Thorough triage concluded the workaround to release the shared ctx on the main thread.
- Using enhanced GLContextShareSet, see below
Make GLContextShareSet lifecycle deterministic
- Programmatically control the lifecycle of tracked shared ctx allows us using 'hard' references.
- Features queries for isShared() and ofc unregister a share set if all are destroyed.
Remove warnings
- MacOSXWindowSystemInterface.m used 'long', where 'GLint' was requested.
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLContext.java')
-rw-r--r-- | src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLContext.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLContext.java index 393bd398b..b387c28c8 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLContext.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLContext.java @@ -39,8 +39,8 @@ package jogamp.opengl.macosx.cgl; - -import javax.media.opengl.*; +import javax.media.opengl.GLContext; +import javax.media.opengl.GLException; public class MacOSXOnscreenCGLContext extends MacOSXCGLContext { @@ -82,7 +82,10 @@ public class MacOSXOnscreenCGLContext extends MacOSXCGLContext { @Override protected boolean createImpl() { boolean res = create(false, false); - if(res && isNSContext) { + if(!isNSContext) { + throw new InternalError("XXX0"); + } + if(res) { if(0 != updateHandle) { throw new InternalError("XXX1"); } @@ -100,7 +103,7 @@ public class MacOSXOnscreenCGLContext extends MacOSXCGLContext { CGL.updateContextUnregister(updateHandle); updateHandle = 0; } - super.destroyImpl(); + super.destroyImpl(); } @Override |