diff options
author | Sven Gothel <[email protected]> | 2011-07-07 03:41:25 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-07-07 03:41:25 +0200 |
commit | 64af11278dfe4d3feb223775e0b3a83a968fcabc (patch) | |
tree | 2582ce5972a2fbd58b72ff48fb92ed9d33bec794 /src/jogl/classes/jogamp/opengl/windows | |
parent | 29cc5fa0375026c09bcbfed16627fe9eb6c97846 (diff) |
Fix SharedResource (SR) Initialization
- Catch exceptions in SR thread avoiding deadlock in blocking caller thread
- Catch NPE on SR queries to return null if appropriate
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/windows')
-rw-r--r-- | src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java index c9cdcad90..8b159ac8e 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java @@ -373,18 +373,6 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl { final static String WGL_ARB_make_current_read = "WGL_ARB_make_current_read"; final static String wglMakeContextCurrent = "wglMakeContextCurrent"; - protected final GLContext getSharedContextImpl(AbstractGraphicsDevice device) { - SharedResourceRunner.Resource sr = sharedResourceRunner.getShared(device); - if(null!=sr) { - return sr.getContext(); - } - return null; - } - - protected final boolean hasSharedContextImpl(AbstractGraphicsDevice device) { - return null != getSharedContextImpl(device); - } - protected final GLContext getOrCreateSharedContextImpl(AbstractGraphicsDevice device) { SharedResourceRunner.Resource sr = sharedResourceRunner.getOrCreateShared(device); if(null!=sr) { |