Merge branch 'master' of github.com:mbien/jogl

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() {