diff options
author | Sven Gothel <[email protected]> | 2023-05-06 20:55:03 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2023-05-06 20:55:03 +0200 |
commit | 542044df793f59f56bbd9e16d0e7620b78c55128 (patch) | |
tree | e4841c0842070d26159710d52ab786e798894eaf /src | |
parent | 40ba8332851364614512324f489ab984cf020586 (diff) |
MacOSXCGLDrawableFactory.canCreateGLPbuffer(): Disabled for MacOS >= 10.13 (High Sierra)
This expands blocking Pbuffer on MacOS, see commit 1562a6d4c71b27378612306f825c2530c938f859
Diffstat (limited to 'src')
-rw-r--r-- | src/jogl/classes/jogamp/opengl/GLContextImpl.java | 4 | ||||
-rw-r--r-- | src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java index 7964416fe..88b746df6 100644 --- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java @@ -94,6 +94,8 @@ public abstract class GLContextImpl extends GLContext { public static final VersionNumber Lion; /** OSX Mavericks, i.e. 10.9.0 */ public static final VersionNumber Mavericks; + /** OSX High Sierra, i.e. 10.13.0 */ + public static final VersionNumber HighSierra; /** OSX Mojave, i.e. 10.14.0 */ public static final VersionNumber Mojave; @@ -101,10 +103,12 @@ public abstract class GLContextImpl extends GLContext { if( Platform.getOSType() == Platform.OSType.MACOS ) { Lion = new VersionNumber(10,7,0); Mavericks = new VersionNumber(10,9,0); + HighSierra = new VersionNumber(10,13,0); Mojave = new VersionNumber(10,14,0); } else { Lion = null; Mavericks = null; + HighSierra = null; Mojave = null; } } diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java index 679ae5b74..663f886db 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java @@ -396,8 +396,8 @@ public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl { public boolean canCreateGLPbuffer(final AbstractGraphicsDevice device, final GLProfile glp) { if( glp.isGL2() ) { // OSX only supports pbuffer w/ compatible, non-core, context - // on MacMacOS < 12 (my setup) or <= 10.14.0 (Mojave) (FIXME) - return Platform.getOSVersionNumber().compareTo(MacOSVersion.Mojave) <= 0; + // on MacMacOS < High Sierra 10.13.6 (my setup) (FIXME) + return Platform.getOSVersionNumber().compareTo(MacOSVersion.HighSierra) <= 0; } else { return false; } |