From 3120d4ad150a24b370d7c64b3af3f0557097e979 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 23 Dec 2013 23:09:23 +0100 Subject: Bug 930 - OSX: Using 'Apple Software Renderer' GLRendererQuirks Quirk GL4NeedsGL3Request not set GL3 core version validation failed due to missing braces around 'isES' _and_ term, where the latter consist out of 2 _or_ terms testing version mismatch. On OSX we validate a GL3 core context first and expect it to return a GL4 version if available, which in turn triggers the quirk GL4NeedsGL3Request. This behavior was disabled due to above mentioned bug, where the unqual major version caused the validation to fail. TestGLProfile01NEWT: Fixed 'GL4ES3' test, where 'GL4ES3' is only available if extension GL_ARB_ES3_compatibility is available as well. --- src/jogl/classes/javax/media/opengl/GLProfile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/jogl/classes/javax/media') diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java index 1f9460f5d..a43ddee07 100644 --- a/src/jogl/classes/javax/media/opengl/GLProfile.java +++ b/src/jogl/classes/javax/media/opengl/GLProfile.java @@ -510,7 +510,7 @@ public class GLProfile { /** The intersection of the desktop GL3 and GL2 profile */ public static final String GL2GL3 = "GL2GL3"; - /** The intersection of the desktop GL4 and ES3 profile */ + /** The intersection of the desktop GL4 and ES3 profile, available only if either ES3 or GL4 w/ GL_ARB_ES3_compatibility is available. */ public static final String GL4ES3 = "GL4ES3"; /** The default profile, used for the device default profile map */ -- cgit v1.2.3