From 3ed74abaddb90cb537897b9928e923be50f7f99f Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 1 Nov 2013 12:40:35 +0100 Subject: GLRendererQuirks: Add GLSharedContextBuggy ('Mesa Intel 9.2.1' and 'Hisilicon Immersion.16') Note: Even though Mesa Intel driver crashes w/ heavy multithreading (Bug 873), it works well w/ our multithreaded GLMediaPlayer. --- .../com/jogamp/opengl/GLRendererQuirks.java | 43 ++++++++++++++++++++-- src/jogl/classes/jogamp/opengl/GLContextImpl.java | 28 +++++++++++--- 2 files changed, 63 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java b/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java index 4a720a4f9..95f87be29 100644 --- a/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java +++ b/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java @@ -192,21 +192,58 @@ public class GLRendererQuirks { public static final int GLSLNonCompliant = 12; /** - * GL4 context needs to be requested via GL3 + * GL4 context needs to be requested via GL3 profile attribute * */ public static final int GL4NeedsGL3Request = 13; + /** + * Buggy shared OpenGL context support within a multithreaded use-case, not suitable for stable usage. + *

+ * X11 Mesa DRI Intel(R) driver >= 9.2.1 cannot handle multithreaded shared GLContext usage + * with non-blocking exclusive X11 display connections. + * References: + *

+ *

+ * However, not all multithreaded use-cases are broken, e.g. our GLMediaPlayer does work. + *

+ * The above has been confirmed for the following Mesa 9.* strings: + * + *

+ *

+ * On Android 4.*, Huawei's Ascend G615 w/ Immersion.16 could not make a shared context + * current, which uses a pbuffer drawable: + *

+ *

+ *

+ *

+ */ + public static final int GLSharedContextBuggy = 14; + /** Number of quirks known. */ - public static final int COUNT = 14; + public static final int COUNT = 15; private static final String[] _names = new String[] { "NoDoubleBufferedPBuffer", "NoDoubleBufferedBitmap", "NoSetSwapInterval", "NoOffscreenBitmap", "NoSetSwapIntervalPostRetarget", "GLSLBuggyDiscard", "GLNonCompliant", "GLFlushBeforeRelease", "DontCloseX11Display", "NeedCurrCtx4ARBPixFmtQueries", "NeedCurrCtx4ARBCreateContext", - "NoFullFBOSupport", "GLSLNonCompliant", "GL4NeedsGL3Request" + "NoFullFBOSupport", "GLSLNonCompliant", "GL4NeedsGL3Request", + "GLSharedContextBuggy" }; private static final IdentityHashMap stickyDeviceQuirks = new IdentityHashMap(); diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java index 92ad62fd6..3f6eb01a0 100644 --- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java @@ -1638,9 +1638,11 @@ public abstract class GLContextImpl extends GLContext { final String MesaSP = "Mesa "; // final String MesaRendererAMDsp = " AMD "; - // final String MesaRendererIntelsp = "Intel(R)"; + final String MesaRendererIntelsp = "Intel(R)"; final boolean hwAccel = 0 == ( ctp & GLContext.CTX_IMPL_ACCEL_SOFT ); final boolean compatCtx = 0 != ( ctp & GLContext.CTX_PROFILE_COMPAT ); + final boolean isX11 = NativeWindowFactory.TYPE_X11 == NativeWindowFactory.getNativeWindowType(true); + final boolean isWindows = Platform.getOSType() == Platform.OSType.WINDOWS; final boolean isDriverMesa = glRenderer.contains(MesaSP) || glRenderer.contains("Gallium "); final boolean isDriverATICatalyst = !isDriverMesa && ( glVendor.contains("ATI Technologies") || glRenderer.startsWith("ATI ") ); final boolean isDriverNVIDIAGeForce = !isDriverMesa && ( glVendor.contains("NVIDIA Corporation") || glRenderer.contains("NVIDIA ") ); @@ -1687,7 +1689,7 @@ public abstract class GLContextImpl extends GLContext { quirks[i++] = quirk; } } - } else if( Platform.getOSType() == Platform.OSType.WINDOWS ) { + } else if( isWindows ) { // // WINDOWS // @@ -1731,12 +1733,19 @@ public abstract class GLContextImpl extends GLContext { } quirks[i++] = quirk; } + if( glRenderer.contains("Immersion.16") ) { + final int quirk = GLRendererQuirks.GLSharedContextBuggy; + if(DEBUG) { + System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: OS "+Platform.getOSType() + " / Renderer " + glRenderer); + } + quirks[i++] = quirk; + } } // // Windowing Toolkit related quirks // - if( NativeWindowFactory.TYPE_X11 == NativeWindowFactory.getNativeWindowType(true) ) { + if( isX11 ) { // // X11 // @@ -1775,6 +1784,8 @@ public abstract class GLContextImpl extends GLContext { // RENDERER related quirks // if( isDriverMesa ) { + final VersionNumber mesaIntelBuggySharedCtx921 = new VersionNumber(9, 2, 1); + { final int quirk = GLRendererQuirks.NoSetSwapIntervalPostRetarget; if(DEBUG) { @@ -1798,8 +1809,15 @@ public abstract class GLContextImpl extends GLContext { } quirks[i++] = quirk; } - if( Platform.getOSType() == Platform.OSType.WINDOWS && glRenderer.contains("SVGA3D") ) - { + if( glRenderer.contains( MesaRendererIntelsp ) && + vendorVersion.compareTo(mesaIntelBuggySharedCtx921) >= 0 && isX11 ) { + final int quirk = GLRendererQuirks.GLSharedContextBuggy; + if(DEBUG) { + System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: X11 / Renderer " + glRenderer + " / Mesa-Version "+vendorVersion); + } + quirks[i++] = quirk; + } + if( isWindows && glRenderer.contains("SVGA3D") ) { final VersionNumber mesaSafeFBOVersion = new VersionNumber(8, 0, 0); if ( vendorVersion.compareTo(mesaSafeFBOVersion) < 0 ) { // includes: vendorVersion.isZero() final int quirk = GLRendererQuirks.NoFullFBOSupport; -- cgit v1.2.3