[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3725] trunk/LWJGL/src/java/org/lwjgl

[<ka...@us...>]

Revision: 3725
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3725&view=rev
Author:   kappa1
Date:     2012-01-16 22:18:31 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
Add extra checks so CALayer's only run on OS X 10.6+, Bump OS X native version

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java

Modified: trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java	2012-01-13 00:53:43 UTC (rev 3724)
+++ trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java	2012-01-16 22:18:31 UTC (rev 3725)
@@ -42,7 +42,7 @@
  * $Id$
  */
 final class MacOSXSysImplementation extends J2SESysImplementation {
-	private static final int JNI_VERSION = 22;
+	private static final int JNI_VERSION = 23;
 
 	static {
 		// Make sure AWT is properly initialized. This avoids hangs on Mac OS X 10.3

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java	2012-01-13 00:53:43 UTC (rev 3724)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java	2012-01-16 22:18:31 UTC (rev 3725)
@@ -83,7 +83,7 @@
 		// due to performance..
         
 		// Allow the use of a Core Animation Layer only when using non fullscreen Display.setParent() or AWTGLCanvas
-		final boolean allowCALayer = ((Display.getParent() != null && !Display.isFullscreen()) || component instanceof AWTGLCanvas) && isApplet(component);
+		final boolean allowCALayer = ((Display.getParent() != null && !Display.isFullscreen()) || component instanceof AWTGLCanvas) && isApplet(component) && LWJGLUtil.isMacOSXEqualsOrBetterThan(10, 6);
 		
 		if (firstLockSucceeded)
 			return lockAndInitHandle(lock_buffer, component, allowCALayer);

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java	2012-01-13 00:53:43 UTC (rev 3724)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java	2012-01-16 22:18:31 UTC (rev 3725)
@@ -35,6 +35,7 @@
 import java.nio.ByteBuffer;
 
 import org.lwjgl.LWJGLException;
+import org.lwjgl.LWJGLUtil;
 
 /**
  *
@@ -51,7 +52,7 @@
 
 	protected void initHandle(Canvas component) throws LWJGLException {
 		// Allow the use of a Core Animation Layer only when using non fullscreen Display.setParent() or AWTGLCanvas
-		final boolean allowCALayer = ((Display.getParent() != null && !Display.isFullscreen()) || component instanceof AWTGLCanvas) && awt_surface.isApplet(component);
+		final boolean allowCALayer = ((Display.getParent() != null && !Display.isFullscreen()) || component instanceof AWTGLCanvas) && awt_surface.isApplet(component) && LWJGLUtil.isMacOSXEqualsOrBetterThan(10, 6);
 		
 		nInitHandle(awt_surface.lockAndGetHandle(component), getHandle(), allowCALayer);
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.