diff options
| author | Sven Gothel <[email protected]> | 2013-07-03 23:26:34 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-07-03 23:26:34 +0200 |
| commit | 88c10ef844f24f089914176d00548ae80230e4c8 (patch) | |
| tree | 1d9ac4b5412838159f5c8e86fd3851414eb84207 /src/jogl | |
| parent | 4e6c2aadd7d652db3ba1f35eef1a3d61d6e692d0 (diff) | |
| parent | 061eb775c0a55c9778c087f8a54df2c6a0a49c9c (diff) | |
Merge remote-tracking branch 'mraynsford/mark'
Diffstat (limited to 'src/jogl')
| -rw-r--r-- | src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java | 13 | ||||
| -rw-r--r-- | src/jogl/classes/jogamp/opengl/GLContextImpl.java | 17 |
2 files changed, 10 insertions, 20 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java b/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java index 9fe74ee97..b119c62c9 100644 --- a/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java +++ b/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java @@ -71,16 +71,9 @@ public class GLRendererQuirks { /** * Non compliant GL context due to a buggy implementation not suitable for use. * <p> - * Mesa >= 9.0 (?), Intel driver, OpenGL 3.1 compatibility context is not compliant: - * <pre> - * GL_RENDERER: 'Mesa .* Intel(R) Sandybridge Desktop' - * </pre> - * </p> - * <p> - * Mesa >= 9.0 (?), AMD driver, OpenGL 3.1 core and compatibility context is not compliant: - * <pre> - * GL_RENDERER: 'Gallium 0.4 on AMD RS880' - * </pre> + * Currently, Mesa >= 9.1.3 (may extend back as far as 9.0) OpenGL 3.1 compatibility + * context is not compliant. Most programs will give completely broken output (or no + * output at all. For now, this context is not trusted. * </p> */ public static final int GLNonCompliant = 6; diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java index 956ba4659..8671b045d 100644 --- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java @@ -1649,16 +1649,13 @@ public abstract class GLContextImpl extends GLContext { } quirks[i++] = quirk; } - if( ( (glRenderer.contains( MesaRendererIntelsp ) && compatCtx) || glRenderer.contains( MesaRendererAMDsp ) ) && - ( major > 3 || major == 3 && minor >= 1 ) - ) - { - // FIXME: Apply vendor version constraints! - final int quirk = GLRendererQuirks.GLNonCompliant; - if(DEBUG) { - System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: Renderer " + glRenderer); - } - quirks[i++] = quirk; + if (compatCtx && (major > 3 || (major == 3 && minor >= 1))) { + // FIXME: Apply vendor version constraints! + final int quirk = GLRendererQuirks.GLNonCompliant; + if(DEBUG) { + System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: Renderer " + glRenderer); + } + quirks[i++] = quirk; } if( Platform.getOSType() == Platform.OSType.WINDOWS && glRenderer.contains("SVGA3D") ) { |