[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3684] trunk/LWJGL/src/native/macosx/ org_lwjgl_opengl_MacOSXCanvasPeerInfo.m

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

Revision: 3684
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3684&view=rev
Author:   kappa1
Date:     2011-10-21 22:50:54 +0000 (Fri, 21 Oct 2011)
Log Message:
-----------
Fix crash on Mac OS X when using Display.setParent() and switching from fullscreen to windowed mode.

Modified Paths:
--------------
    trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m

Modified: trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m
===================================================================
--- trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m	2011-10-20 10:36:42 UTC (rev 3683)
+++ trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m	2011-10-21 22:50:54 UTC (rev 3684)
@@ -52,7 +52,6 @@
 @interface PBufferGLLayer : NSOpenGLLayer {
     MacOSXPeerInfo *peer_info;
     GLuint textureID;
-    BOOL canDraw;
 }
 
 - (MacOSXPeerInfo*) peer_info;
@@ -78,7 +77,7 @@
 			jint width = surface->dsi->bounds.width;
 			jint height = surface->dsi->bounds.height;
 			
-			if(peer_info->pbuffer == NULL || width != [peer_info->pbuffer pixelsWide] || height != [peer_info->pbuffer pixelsHigh]) {
+			if(peer_info->pbuffer == NULL || peer_info->window || width != [peer_info->pbuffer pixelsWide] || height != [peer_info->pbuffer pixelsHigh]) {
 				if(peer_info->pbuffer != NULL) {
 					[peer_info->pbuffer release];
 				}
@@ -193,7 +192,7 @@
 			   pixelFormat:(CGLPixelFormatObj)pixelFormat
 			  forLayerTime:(CFTimeInterval)timeInterval
 			   displayTime:(const CVTimeStamp *)timeStamp {
-    return peer_info->canDrawGL ? YES : NO;
+    return (peer_info->canDrawGL && !peer_info->window) ? YES : NO;
 }
 
 - (MacOSXPeerInfo*) peer_info {

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