Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10840/src/java/org/lwjgl/opengl Modified Files: MacOSXAWTGLCanvasPeerInfo.java MacOSXCanvasImplementation.java MacOSXCanvasPeerInfo.java MacOSXDisplay.java MacOSXDisplayPeerInfo.java Log Message: Mac OS X: Fixed an issue where pbuffer contexts could not share with the display context. Index: MacOSXCanvasImplementation.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasImplementation.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- MacOSXCanvasImplementation.java 4 May 2005 20:59:36 -0000 1.2 +++ MacOSXCanvasImplementation.java 4 Nov 2005 12:38:59 -0000 1.3 @@ -44,7 +44,11 @@ */ final class MacOSXCanvasImplementation implements AWTCanvasImplementation { public PeerInfo createPeerInfo(AWTGLCanvas canvas, PixelFormat pixel_format) throws LWJGLException { - return new MacOSXAWTGLCanvasPeerInfo(canvas, pixel_format); + try { + return new MacOSXAWTGLCanvasPeerInfo(canvas, pixel_format, true); + } catch (LWJGLException e) { + return new MacOSXAWTGLCanvasPeerInfo(canvas, pixel_format, false); + } } /** Index: MacOSXDisplay.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- MacOSXDisplay.java 31 Oct 2005 10:51:54 -0000 1.37 +++ MacOSXDisplay.java 4 Nov 2005 12:38:59 -0000 1.38 @@ -215,7 +215,11 @@ } public PeerInfo createPeerInfo(PixelFormat pixel_format) throws LWJGLException { - return new MacOSXDisplayPeerInfo(pixel_format); + try { + return new MacOSXDisplayPeerInfo(pixel_format, true); + } catch (LWJGLException e) { + return new MacOSXDisplayPeerInfo(pixel_format, false); + } } private final static IntBuffer current_viewport = BufferUtils.createIntBuffer(16); Index: MacOSXAWTGLCanvasPeerInfo.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTGLCanvasPeerInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- MacOSXAWTGLCanvasPeerInfo.java 4 May 2005 20:59:38 -0000 1.2 +++ MacOSXAWTGLCanvasPeerInfo.java 4 Nov 2005 12:38:59 -0000 1.3 @@ -42,8 +42,8 @@ final class MacOSXAWTGLCanvasPeerInfo extends MacOSXCanvasPeerInfo { private final AWTGLCanvas canvas; - public MacOSXAWTGLCanvasPeerInfo(AWTGLCanvas canvas, PixelFormat pixel_format) throws LWJGLException { - super(pixel_format); + public MacOSXAWTGLCanvasPeerInfo(AWTGLCanvas canvas, PixelFormat pixel_format, boolean support_pbuffer) throws LWJGLException { + super(pixel_format, support_pbuffer); this.canvas = canvas; } Index: MacOSXDisplayPeerInfo.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplayPeerInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- MacOSXDisplayPeerInfo.java 4 May 2005 20:59:33 -0000 1.2 +++ MacOSXDisplayPeerInfo.java 4 Nov 2005 12:38:59 -0000 1.3 @@ -44,8 +44,8 @@ final class MacOSXDisplayPeerInfo extends MacOSXCanvasPeerInfo { private boolean locked = false; - public MacOSXDisplayPeerInfo(PixelFormat pixel_format) throws LWJGLException { - super(pixel_format); + public MacOSXDisplayPeerInfo(PixelFormat pixel_format, boolean support_pbuffer) throws LWJGLException { + super(pixel_format, support_pbuffer); } protected void doLockAndInitHandle() throws LWJGLException { Index: MacOSXCanvasPeerInfo.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- MacOSXCanvasPeerInfo.java 4 May 2005 20:59:36 -0000 1.2 +++ MacOSXCanvasPeerInfo.java 4 Nov 2005 12:38:59 -0000 1.3 @@ -45,8 +45,8 @@ abstract class MacOSXCanvasPeerInfo extends MacOSXPeerInfo { private final AWTSurfaceLock awt_surface = new AWTSurfaceLock(); - public MacOSXCanvasPeerInfo(PixelFormat pixel_format) throws LWJGLException { - super(pixel_format, true, true, false, true); + public MacOSXCanvasPeerInfo(PixelFormat pixel_format, boolean support_pbuffer) throws LWJGLException { + super(pixel_format, true, true, support_pbuffer, true); } protected void initHandle(Canvas canvas) throws LWJGLException { |