diff options
author | Sven Gothel <[email protected]> | 2012-10-02 17:56:20 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2012-10-02 17:56:20 +0200 |
commit | f7ca4df7b4e6b2acbdb941f67f6d7058db134d91 (patch) | |
tree | f7c8d2e545ee52d25e9e79dc11b09f45a45a740f /src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java | |
parent | a7ab7a722db30f2016b15f0d55d1fa165f30282e (diff) |
Fix regression of fbe331f013608eb31ff0d8675f4e4c9881c9c48b [Remove XInitThreads()]
NativeWindowFactory.getDefaultToolkitLock() is no more a global singleton,
but an instance which has to track/lock a single resource.
Hence the decoration w/ it in GLDrawableFactory is useless and applying lock/unlock
on a new instance also a bug/regression.
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java')
-rw-r--r-- | src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java b/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java index 0ea565b89..deb187372 100644 --- a/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java @@ -441,24 +441,14 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory { @Override public GLContext createExternalGLContext() { - NativeWindowFactory.getDefaultToolkitLock().lock(); - try { - return createExternalGLContextImpl(); - } finally { - NativeWindowFactory.getDefaultToolkitLock().unlock(); - } + return createExternalGLContextImpl(); } protected abstract GLDrawable createExternalGLDrawableImpl(); @Override public GLDrawable createExternalGLDrawable() { - NativeWindowFactory.getDefaultToolkitLock().lock(); - try { - return createExternalGLDrawableImpl(); - } finally { - NativeWindowFactory.getDefaultToolkitLock().unlock(); - } + return createExternalGLDrawableImpl(); } |