From 012fca06f2539db232f0183f72187ec2f8ca54f5 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 22 Apr 2010 21:15:48 +0200 Subject: Review of using isGL2() and GL2.GL* --- src/jogl/classes/javax/media/opengl/GLContext.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/jogl/classes/javax/media/opengl/GLContext.java') 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() { -- cgit v1.2.3