diff options
Diffstat (limited to 'src')
4 files changed, 9 insertions, 3 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java index 9fcddbbfa..61705439e 100644 --- a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java +++ b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java @@ -776,8 +776,14 @@ public abstract class GLContextImpl extends GLContext { setContextVersion(major, minor, ctp); extensionAvailability.reset(); + + hasNativeES2Methods = isGLES2() || isExtensionAvailable("GL_ARB_ES2_compatibility") ; } + protected boolean hasNativeES2Methods = false; + + public final boolean hasNativeES2Methods() { return hasNativeES2Methods; } + /** * Returns true if the specified OpenGL core- or extension-function can be * successfully called using this GL context given the current host (OpenGL diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java index 21c1b96a0..347c07e70 100644 --- a/src/jogl/classes/javax/media/opengl/GLContext.java +++ b/src/jogl/classes/javax/media/opengl/GLContext.java @@ -443,7 +443,7 @@ public abstract class GLContext { /* 1.*/ { 0, 1, 2, 3, 4, 5 }, /* 2.*/ { 0, 1 }, /* 3.*/ { 0, 1, 2, 3 }, - /* 4.*/ { 0 } }; + /* 4.*/ { 0, 1 } }; public static final int getMaxMajor() { return GL_VERSIONS.length-1; diff --git a/src/newt/classes/com/jogamp/newt/Display.java b/src/newt/classes/com/jogamp/newt/Display.java index a8ab8d520..00abd8406 100644 --- a/src/newt/classes/com/jogamp/newt/Display.java +++ b/src/newt/classes/com/jogamp/newt/Display.java @@ -45,7 +45,7 @@ import java.util.*; public abstract class Display { public static final boolean DEBUG = Debug.debug("Display"); - public static final boolean DEBUG_TEST_EDT_MAINTHREAD = Debug.debug("TestEDTMainThread"); // JAU EDT Test .. + public static final boolean DEBUG_TEST_EDT_MAINTHREAD = Debug.isPropertyDefined("newt.test.EDTMainThread", true); // JAU EDT Test .. private static Class getDisplayClass(String type) throws ClassNotFoundException diff --git a/src/newt/classes/com/jogamp/newt/impl/Debug.java b/src/newt/classes/com/jogamp/newt/impl/Debug.java index 62c261d2e..068283144 100644 --- a/src/newt/classes/com/jogamp/newt/impl/Debug.java +++ b/src/newt/classes/com/jogamp/newt/impl/Debug.java @@ -83,7 +83,7 @@ public class Debug { return b.booleanValue(); } - static boolean isPropertyDefined(final String property, final boolean jnlpAlias) { + public static boolean isPropertyDefined(final String property, final boolean jnlpAlias) { return isPropertyDefined(property, jnlpAlias, localACC); } |