summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Krisher <[email protected]>2011-02-03 00:59:55 +0800
committerSven Gothel <[email protected]>2011-02-05 15:04:21 +0800
commit33a2605d37ec590b8a7fd37a708f8159cb9bd487 (patch)
treee3c787a45c0b908168165cf9a513573b96b4a974
parent0e8339fce21c7b5dc6bd9cbc8d09e308d6b3b3c7 (diff)
Move GLCanvas' static initialization of default GLProfile into constructor to avoid requiring native libraries at class initialization time.
-rw-r--r--src/jogl/classes/javax/media/opengl/awt/GLCanvas.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
index acabe58a5..75b9ec375 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
@@ -138,11 +138,9 @@ import com.jogamp.opengl.impl.ThreadingImpl;
public class GLCanvas extends Canvas implements AWTGLAutoDrawable, WindowClosingProtocol {
private static final boolean DEBUG;
- private static final GLProfile defaultGLProfile;
static {
DEBUG = Debug.debug("GLCanvas");
- defaultGLProfile = GLProfile.getDefault(GLProfile.getDefaultDesktopDevice());
}
private GLDrawableHelper drawableHelper = new GLDrawableHelper();
@@ -220,7 +218,7 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable, WindowClosing
super();
if(null==capsReqUser) {
- capsReqUser = new GLCapabilities(defaultGLProfile);
+ capsReqUser = new GLCapabilities(GLProfile.getDefault(GLProfile.getDefaultDesktopDevice()));
} else {
// don't allow the user to change data
capsReqUser = (GLCapabilitiesImmutable) capsReqUser.cloneMutable();