diff options
| author | Kenneth Russel <[email protected]> | 2008-11-21 01:29:56 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2008-11-21 01:29:56 +0000 |
| commit | 6d7526cd278a9aebe8b2ea6a5c963b6a7201dd0c (patch) | |
| tree | 8ac4308154b285c8910a1126db4ab220cf72b6d3 /src/classes/javax/media | |
| parent | 36cc7d0aca61320a0b1377174af6724b48f558a8 (diff) | |
Fixed build.xml to build correct version of TextureIO classes on the
desktop. Changed GLCanvas to set the GLProfile to GL2 by default since
there are no plans to support the AWT components on anything except
desktop profiles, where OpenGL ES is not present. This reduces the
amount of changes that must be made to code using earlier versions of
JOGL.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1796 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src/classes/javax/media')
| -rw-r--r-- | src/classes/javax/media/opengl/awt/GLCanvas.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/classes/javax/media/opengl/awt/GLCanvas.java b/src/classes/javax/media/opengl/awt/GLCanvas.java index 838ce7129..bead18bb9 100644 --- a/src/classes/javax/media/opengl/awt/GLCanvas.java +++ b/src/classes/javax/media/opengl/awt/GLCanvas.java @@ -79,6 +79,13 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable { private GLCapabilities glCaps; private GLCapabilitiesChooser glCapChooser; + static { + // Default to the GL2 profile, which is the default on the desktop + if (GLProfile.getProfile() == null) { + GLProfile.setProfile(GLProfile.GL2); + } + } + /** Creates a new GLCanvas component with a default set of OpenGL capabilities, using the default OpenGL capabilities selection mechanism, on the default screen device. */ |