diff options
| author | Sven Gothel <[email protected]> | 2019-12-08 02:46:20 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-12-08 02:46:20 +0100 |
| commit | bb3ee12b7aeef276a03f091333eacc68542e784b (patch) | |
| tree | 31c0a5342016b1cd71d2f704f9b7b21bf729db69 /src/jogl | |
| parent | 6f750711fbcdf746451995e71165bbd119694269 (diff) | |
Bug 1200: GLRendererQuirks.NoSurfacelessCtx still persists on Linux/X11 NVIDIA 440.36 using FBO
Tested with com.jogamp.opengl.test.junit.jogl.tile.TestTiledPrintingGearsNewtAWT,
which crashes in native makeCurrent of NV driver gl-core when using SurfacelessCtx.
Therefor we had to revert the commit 4fe9e1dfa67f4e5d614f48c02ad88e4cdd1ed415
enabling SurfacelessCtx with NV driver >= 430.40.
Diffstat (limited to 'src/jogl')
| -rw-r--r-- | src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java | 1 | ||||
| -rw-r--r-- | src/jogl/classes/jogamp/opengl/GLContextImpl.java | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java b/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java index c62a7d298..3e344b58a 100644 --- a/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java +++ b/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java @@ -475,6 +475,7 @@ public class GLRendererQuirks { * <li>GNU/Linux X11 Nvidia proprietary driver * <ul> * <li>GL_VERSION 4.4.0 NVIDIA 340.24</li> + * <li>GL_VERSION 4.6.0 NVIDIA 440.36</li> * <li>Platform GNU/Linux X11</li> * </ul></li> * </ul> diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java index f8ad1be0c..60a351fc2 100644 --- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java @@ -2424,9 +2424,9 @@ public abstract class GLContextImpl extends GLContext { } } if( isDriverNVIDIAGeForce ) { - // Bug 1200: Crash on GNU/Linux x86_64 'NVidia beta driver 355.06' @ probeSurfacelessCtx - final VersionNumber nvSafeVersion = new VersionNumber(430, 40, 0); - if( !isES && !(adevice instanceof EGLGraphicsDevice) && vendorVersion.compareTo(nvSafeVersion) < 0 ) { + // Bug 1200: Crash on GNU/Linux x86_64 'NVidia beta driver 355.06' and 'latest' 440.36 @ probeSurfacelessCtx + // final VersionNumber nvSafeVersion = new VersionNumber(440, 36, 0); // FIXME: Add safe version + if( !isES && !(adevice instanceof EGLGraphicsDevice) /* && vendorVersion.compareTo(nvSafeVersion) < 0 */ ) { final int quirk = GLRendererQuirks.NoSurfacelessCtx; if(DEBUG) { System.err.print("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: !ES, !EGL, Vendor " + glVendor +", X11 Renderer " + glRenderer+", Version=[vendor " + vendorVersion + ", GL " + glVersion+"]"); |