diff options
author | Michael Bien <[email protected]> | 2010-04-22 23:27:41 +0200 |
---|---|---|
committer | Michael Bien <[email protected]> | 2010-04-22 23:27:41 +0200 |
commit | d5b392ac40d8f7c65e76aca5673748cf24b8a1e8 (patch) | |
tree | 6aefdbde469d8620c65b82174db1ad043e433c66 /src/jogl/classes/javax/media | |
parent | ca6818d87ee86b2cc9961e47ad9f899e1fd90f78 (diff) | |
parent | 012fca06f2539db232f0183f72187ec2f8ca54f5 (diff) |
Merge branch 'master' of github.com:mbien/jogl
Diffstat (limited to 'src/jogl/classes/javax/media')
-rw-r--r-- | src/jogl/classes/javax/media/opengl/GLContext.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java index e5b499af9..2709dd506 100644 --- a/src/jogl/classes/javax/media/opengl/GLContext.java +++ b/src/jogl/classes/javax/media/opengl/GLContext.java @@ -378,6 +378,10 @@ public abstract class GLContext { return ctxMajorVersion>=1 && CTX_PROFILE_COMPAT==(ctxOptions & (CTX_PROFILE_COMPAT|CTX_PROFILE_ES)); } + public final boolean isGL2GL3() { + return isGL2() || isGL3(); + } + public final boolean isGLES1() { return ctxMajorVersion==1 && CTX_PROFILE_ES==(ctxOptions & CTX_PROFILE_ES); } @@ -395,11 +399,7 @@ public abstract class GLContext { } public final boolean isGL2ES2() { - return isGL2() || isGL3() || isGLES2() ; - } - - public final boolean isGL2GL3() { - return isGL2() || isGL3(); + return isGL2GL3() || isGLES2() ; } public final boolean hasGLSL() { |