diff options
author | Sven Gothel <[email protected]> | 2013-09-07 16:50:39 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2013-09-07 16:50:39 +0200 |
commit | 42500210d8a8626ee6c3c1b169eaa9e5fbf85a21 (patch) | |
tree | 147bc80a9c6095cd6022fed5198a971d5e491342 /src/jogl/classes/javax | |
parent | 4b5e77961d1c660f3537f4041fc1a3ce47ef105c (diff) |
Complete commit 54dcdf1f53c9fc1f7124cf77bbf5aa952d42053a, exposing GL2ES3 in GLProfile (just a query, no new profile)
Diffstat (limited to 'src/jogl/classes/javax')
-rw-r--r-- | src/jogl/classes/javax/media/opengl/GLContext.java | 3 | ||||
-rw-r--r-- | src/jogl/classes/javax/media/opengl/GLProfile.java | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java index f6c03b537..618ee2584 100644 --- a/src/jogl/classes/javax/media/opengl/GLContext.java +++ b/src/jogl/classes/javax/media/opengl/GLContext.java @@ -1115,8 +1115,7 @@ public abstract class GLContext { /** * Indicates whether this GLContext is capable of GL2ES3. <p>Includes [ GL4bc, GL4, GL3bc, GL3, GLES3, GL3ES3, GL2, GL2GL3 ].</p> - * @see GLProfile#isGL3ES3() - * @see GLProfile#isGL2GL3() + * @see GLProfile#isGL2ES3() */ public final boolean isGL2ES3() { return isGL3ES3() || isGL2GL3(); diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java index e3078271e..b5e89a23b 100644 --- a/src/jogl/classes/javax/media/opengl/GLProfile.java +++ b/src/jogl/classes/javax/media/opengl/GLProfile.java @@ -1128,6 +1128,15 @@ public class GLProfile { return GL2ES2 == profile || isGLES2() || isGL2GL3(); } + /** + * Indicates whether this profile is capable of GL2ES3. <p>Includes [ GL4bc, GL4, GL3bc, GL3, GLES3, GL3ES3, GL2, GL2GL3 ].</p> + * @see isGL3ES3() + * @see isGL2GL3() + */ + public final boolean isGL2ES3() { + return isGL3ES3() || isGL2GL3(); + } + /** Indicates whether this profile is capable of GL3ES3. <p>Includes [ GL4bc, GL4, GL3bc, GL3, GLES3 ].</p> */ public final boolean isGL3ES3() { return isGL4ES3() || isGL3(); |