diff options
Diffstat (limited to 'src')
6 files changed, 18 insertions, 13 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java index ee9d36147..8bd3c4777 100644 --- a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java +++ b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java @@ -33,11 +33,10 @@ import com.jogamp.common.os.Platform; import com.jogamp.common.util.VersionUtil; import com.jogamp.common.util.JogampVersion; import java.util.jar.Manifest; -import javax.media.nativewindow.AbstractGraphicsDevice; public class JoglVersion extends JogampVersion { - protected static JoglVersion jogampCommonVersionInfo; + protected static volatile JoglVersion jogampCommonVersionInfo; protected JoglVersion(String packageName, Manifest mf) { super(packageName, mf); @@ -48,8 +47,7 @@ public class JoglVersion extends JogampVersion { synchronized(JoglVersion.class) { if( null == jogampCommonVersionInfo ) { final String packageName = "javax.media.opengl"; - final String fullClazzName = "javax.media.opengl.GL"; - final Manifest mf = VersionUtil.getManifest(JoglVersion.class.getClassLoader(), fullClazzName); + final Manifest mf = VersionUtil.getManifest(JoglVersion.class.getClassLoader(), packageName); jogampCommonVersionInfo = new JoglVersion(packageName, mf); } } @@ -57,8 +55,8 @@ public class JoglVersion extends JogampVersion { return jogampCommonVersionInfo; } - public StringBuffer toStringBuffer(GL gl, StringBuffer sb) { - sb = super.toStringBuffer(sb); + public StringBuffer toString(GL gl, StringBuffer sb) { + sb = super.toString(sb); getGLInfo(gl, sb); sb.append("-----------------------------------------------------------------------------------------------------"); @@ -68,7 +66,7 @@ public class JoglVersion extends JogampVersion { } public String toString(GL gl) { - return toStringBuffer(gl, null).toString(); + return toString(gl, null).toString(); } public static StringBuffer getGLInfo(GL gl, StringBuffer sb) { @@ -99,6 +97,7 @@ public class JoglVersion extends JogampVersion { } public static void main(String args[]) { + System.err.println(VersionUtil.getPlatformInfo()); System.err.println(JoglVersion.getInstance()); } } diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java index 02252ac33..dab0c0daa 100644 --- a/src/jogl/classes/javax/media/opengl/GLProfile.java +++ b/src/jogl/classes/javax/media/opengl/GLProfile.java @@ -40,6 +40,7 @@ package javax.media.opengl; import com.jogamp.common.GlueGenVersion; import com.jogamp.common.jvm.JVMUtil; import com.jogamp.common.util.ReflectionUtil; +import com.jogamp.common.util.VersionUtil; import com.jogamp.nativewindow.NativeWindowVersion; import com.jogamp.opengl.impl.Debug; import com.jogamp.opengl.impl.GLDrawableFactoryImpl; @@ -1172,6 +1173,7 @@ public class GLProfile { addedAnyProfile = addedAnyProfile || initProfilesForDevice(defaultEGLDevice); if(DEBUG) { + System.err.println(VersionUtil.getPlatformInfo()); System.err.println(GlueGenVersion.getInstance()); System.err.println(NativeWindowVersion.getInstance()); System.err.print(JoglVersion.getInstance()); diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java index b20a4ff13..f2016a23c 100644 --- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java +++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java @@ -41,6 +41,7 @@ package javax.media.opengl.awt; import com.jogamp.common.GlueGenVersion; +import com.jogamp.common.util.VersionUtil; import com.jogamp.nativewindow.NativeWindowVersion; import javax.media.opengl.*; import javax.media.nativewindow.*; @@ -792,6 +793,7 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable { * A most simple JOGL AWT test entry */ public static void main(String args[]) { + System.err.println(VersionUtil.getPlatformInfo()); System.err.println(GlueGenVersion.getInstance()); System.err.println(NativeWindowVersion.getInstance()); System.err.print(JoglVersion.getInstance()); diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowVersion.java b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowVersion.java index 55757fc42..6f4c75887 100644 --- a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowVersion.java +++ b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowVersion.java @@ -34,7 +34,7 @@ import java.util.jar.Manifest; public class NativeWindowVersion extends JogampVersion { - protected static NativeWindowVersion jogampCommonVersionInfo; + protected static volatile NativeWindowVersion jogampCommonVersionInfo; protected NativeWindowVersion(String packageName, Manifest mf) { super(packageName, mf); @@ -45,8 +45,7 @@ public class NativeWindowVersion extends JogampVersion { synchronized(NativeWindowVersion.class) { if( null == jogampCommonVersionInfo ) { final String packageName = "javax.media.nativewindow"; - final String fullClazzName = NativeWindowVersion.class.getName(); - final Manifest mf = VersionUtil.getManifest(NativeWindowVersion.class.getClassLoader(), fullClazzName); + final Manifest mf = VersionUtil.getManifest(NativeWindowVersion.class.getClassLoader(), packageName); jogampCommonVersionInfo = new NativeWindowVersion(packageName, mf); } } @@ -55,6 +54,7 @@ public class NativeWindowVersion extends JogampVersion { } public static void main(String args[]) { + System.err.println(VersionUtil.getPlatformInfo()); System.err.println(NativeWindowVersion.getInstance()); } } diff --git a/src/newt/classes/com/jogamp/newt/NewtVersion.java b/src/newt/classes/com/jogamp/newt/NewtVersion.java index 2493787d7..aee67c4bc 100644 --- a/src/newt/classes/com/jogamp/newt/NewtVersion.java +++ b/src/newt/classes/com/jogamp/newt/NewtVersion.java @@ -34,7 +34,7 @@ import java.util.jar.Manifest; public class NewtVersion extends JogampVersion { - protected static NewtVersion jogampCommonVersionInfo; + protected static volatile NewtVersion jogampCommonVersionInfo; protected NewtVersion(String packageName, Manifest mf) { super(packageName, mf); @@ -45,8 +45,7 @@ public class NewtVersion extends JogampVersion { synchronized(NewtVersion.class) { if( null == jogampCommonVersionInfo ) { final String packageName = "com.jogamp.newt"; - final String fullClazzName = NewtVersion.class.getName(); - final Manifest mf = VersionUtil.getManifest(NewtVersion.class.getClassLoader(), fullClazzName); + final Manifest mf = VersionUtil.getManifest(NewtVersion.class.getClassLoader(), packageName); jogampCommonVersionInfo = new NewtVersion(packageName, mf); } } @@ -55,6 +54,7 @@ public class NewtVersion extends JogampVersion { } public static void main(String args[]) { + System.err.println(VersionUtil.getPlatformInfo()); System.err.println(NewtVersion.getInstance()); } } diff --git a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java index 6c0635006..7c0384bd0 100644 --- a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java +++ b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java @@ -35,6 +35,7 @@ package com.jogamp.newt.opengl; import com.jogamp.common.GlueGenVersion; +import com.jogamp.common.util.VersionUtil; import com.jogamp.nativewindow.NativeWindowVersion; import com.jogamp.newt.*; import com.jogamp.newt.event.*; @@ -862,6 +863,7 @@ public class GLWindow implements GLAutoDrawable, Window, NEWTEventConsumer { * A most simple JOGL AWT test entry */ public static void main(String args[]) { + System.err.println(VersionUtil.getPlatformInfo()); System.err.println(GlueGenVersion.getInstance()); System.err.println(NativeWindowVersion.getInstance()); System.err.print(JoglVersion.getInstance()); |