diff options
| author | Sven Gothel <[email protected]> | 2010-06-26 07:02:16 +0300 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-06-26 07:02:16 +0300 |
| commit | c9adeced407a9f652594c1334a3ae73eff4fba79 (patch) | |
| tree | 169abf645cabbb6c483fbb46ea46630412e3f9c6 /src/jogl/classes/javax/media/opengl/GLProfile.java | |
| parent | f0bee9b5d23e100fe92b019c1afb76d8223c0d76 (diff) | |
| parent | 33a24c85dd18d851b614359bb6b19535afd56d33 (diff) | |
Merge branch 'master' of github.com:sgothel/jogl
Diffstat (limited to 'src/jogl/classes/javax/media/opengl/GLProfile.java')
| -rw-r--r-- | src/jogl/classes/javax/media/opengl/GLProfile.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java index 21d32e16a..3b40dbe69 100644 --- a/src/jogl/classes/javax/media/opengl/GLProfile.java +++ b/src/jogl/classes/javax/media/opengl/GLProfile.java @@ -854,16 +854,18 @@ public class GLProfile { NativeWindowFactory.initSingleton(); + ClassLoader classloader = GLProfile.class.getClassLoader(); + isAWTAvailable = NativeWindowFactory.isAWTAvailable() && - ReflectionUtil.isClassAvailable("javax.media.opengl.awt.GLCanvas") ; // JOGL + ReflectionUtil.isClassAvailable("javax.media.opengl.awt.GLCanvas", classloader) ; // JOGL - hasGL234Impl = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.gl4.GL4bcImpl"); + hasGL234Impl = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.gl4.GL4bcImpl", classloader); hasGL4bcImpl = hasGL234Impl; hasGL4Impl = hasGL234Impl; hasGL3bcImpl = hasGL234Impl; hasGL3Impl = hasGL234Impl; hasGL2Impl = hasGL234Impl; - hasGL2ES12Impl = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.gl2es12.GL2ES12Impl"); + hasGL2ES12Impl = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.gl2es12.GL2ES12Impl", classloader); mappedProfiles = computeProfileMap(); boolean hasDesktopGL = false; @@ -929,7 +931,7 @@ public class GLProfile { hasGL2ES12Impl = hasGL2ES12Impl && GLContext.isGL2Available(); } - if ( ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.egl.EGLDrawableFactory") ) { + if ( ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.egl.EGLDrawableFactory", classloader) ) { t=null; try { GLDrawableFactoryImpl factory = (GLDrawableFactoryImpl) GLDrawableFactory.getFactoryImpl(GLES2); |