diff options
author | Sven Gothel <[email protected]> | 2009-06-15 11:05:16 +0000 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2009-06-15 11:05:16 +0000 |
commit | 3fe015eb484c1ff9bed8866709f9fe9bbe69115b (patch) | |
tree | 43b12f6758dbab84e29f69a8ddec1ab224b8355d /src/jogl | |
parent | 20410581cc82a980a48d5fd79acdefa565732735 (diff) |
Fix: JAWTUtil has to JAWTNativeLibLoader.loadAWTImpl() as well. Use NWReflection.isClassAvailable() if possible. NWReflection.getClass() takes boolean init.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1956 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src/jogl')
-rw-r--r-- | src/jogl/classes/com/sun/opengl/impl/NativeLibLoader.java | 6 | ||||
-rw-r--r-- | src/jogl/classes/javax/media/opengl/GLProfile.java | 16 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/jogl/classes/com/sun/opengl/impl/NativeLibLoader.java b/src/jogl/classes/com/sun/opengl/impl/NativeLibLoader.java index f4425c9df..12dc8fc7d 100644 --- a/src/jogl/classes/com/sun/opengl/impl/NativeLibLoader.java +++ b/src/jogl/classes/com/sun/opengl/impl/NativeLibLoader.java @@ -117,6 +117,9 @@ public class NativeLibLoader extends NativeLibLoaderBase { for (int i=0; i<preload.length; i++) { if(!isLoaded(preload[i])) { try { + if(DEBUG) { + System.err.println("JOGL NativeLibLoader preload "+preload[i]); + } loadLibraryInternal(preload[i]); addLoaded(preload[i]); } @@ -130,6 +133,9 @@ public class NativeLibLoader extends NativeLibLoaderBase { } } + if(DEBUG) { + System.err.println("JOGL NativeLibLoader load "+libname); + } loadLibraryInternal(libname); addLoaded(libname); } diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java index c1566ddd0..57f4fb46a 100644 --- a/src/jogl/classes/javax/media/opengl/GLProfile.java +++ b/src/jogl/classes/javax/media/opengl/GLProfile.java @@ -658,21 +658,21 @@ public class GLProfile implements Cloneable { } // FIXME: check for real GL3 availability .. ? - hasGL3Impl = hasDesktopGL && null!=NWReflection.getClass("com.sun.opengl.impl.gl3.GL3Impl"); - hasGL2Impl = hasDesktopGL && null!=NWReflection.getClass("com.sun.opengl.impl.gl2.GL2Impl"); + hasGL3Impl = hasDesktopGL && NWReflection.isClassAvailable("com.sun.opengl.impl.gl3.GL3Impl"); + hasGL2Impl = hasDesktopGL && NWReflection.isClassAvailable("com.sun.opengl.impl.gl2.GL2Impl"); - hasGL2ES12Impl = hasDesktopGLES12 && null!=NWReflection.getClass("com.sun.opengl.impl.gl2es12.GL2ES12Impl"); + hasGL2ES12Impl = hasDesktopGLES12 && NWReflection.isClassAvailable("com.sun.opengl.impl.gl2es12.GL2ES12Impl"); boolean btest = false; - boolean hasEGLDynLookup = null!=NWReflection.getClass("com.sun.opengl.impl.egl.EGLDynamicLookupHelper"); + boolean hasEGLDynLookup = NWReflection.isClassAvailable("com.sun.opengl.impl.egl.EGLDynamicLookupHelper"); boolean hasEGLDrawableFactory = false; try { if(hasEGLDynLookup) { hasEGLDrawableFactory = null!=GLDrawableFactory.getFactoryImpl(GLES2); btest = hasEGLDrawableFactory && - null!=NWReflection.getClass("com.sun.opengl.impl.es2.GLES2Impl") && - null!=com.sun.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(2); + NWReflection.isClassAvailable("com.sun.opengl.impl.es2.GLES2Impl") && + null!=com.sun.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(2); } } catch (Throwable t) { if (DEBUG) { @@ -686,8 +686,8 @@ public class GLProfile implements Cloneable { try { if(hasEGLDynLookup) { btest = hasEGLDrawableFactory && - null!=NWReflection.getClass("com.sun.opengl.impl.es1.GLES1Impl") && - null!=com.sun.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(1); + NWReflection.isClassAvailable("com.sun.opengl.impl.es1.GLES1Impl") && + null!=com.sun.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(1); } } catch (Throwable t) { if (DEBUG) { |