java-game-lib-cvs Mailing List for Lightweight Java Game Library

Revision: 2621
          http://svn.sourceforge.net/java-game-lib/?rev=2621&view=rev
Author:   elias_naur
Date:     2006-11-07 07:14:31 -0800 (Tue, 07 Nov 2006)

Log Message:
-----------
AWTGLCanvas: Synchronize paintGL() to avoid destroyContext while painting

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java	2006-10-31 09:52:38 UTC (rev 2620)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java	2006-11-07 15:14:31 UTC (rev 2621)
@@ -283,43 +283,45 @@
 	 * be overridden to do GL operations.
 	 */
 	public final void paint(Graphics g) {
-		try {
-			if (peer_info == null) {
-				this.peer_info = implementation.createPeerInfo(this, pixel_format);
-			}
-			peer_info.lockAndGetHandle();
+		synchronized (SYNC_LOCK) {
 			try {
-				if (context == null) {
-					this.context = new Context(peer_info, drawable != null ? drawable.getContext() : null);
-					first_run = true;
+				if (peer_info == null) {
+					this.peer_info = implementation.createPeerInfo(this, pixel_format);
 				}
-				
-				if (reentry_count == 0)
-					context.makeCurrent();
-				reentry_count++;
+				peer_info.lockAndGetHandle();
 				try {
-					if (update_context) {
-						context.update();
-						update_context = false;
+					if (context == null) {
+						this.context = new Context(peer_info, drawable != null ? drawable.getContext() : null);
+						first_run = true;
 					}
-					AWTCanvasInputImplementation current_input = awt_input;
-					if (current_input != null)
-						current_input.processInput(peer_info);
-					if (first_run) {
-						first_run = false;
-						initGL();
+
+					if (reentry_count == 0)
+						context.makeCurrent();
+					reentry_count++;
+					try {
+						if (update_context) {
+							context.update();
+							update_context = false;
+						}
+						AWTCanvasInputImplementation current_input = awt_input;
+						if (current_input != null)
+							current_input.processInput(peer_info);
+						if (first_run) {
+							first_run = false;
+							initGL();
+						}
+						paintGL();
+					} finally {
+						reentry_count--;
+						if (reentry_count == 0)
+							Context.releaseCurrentContext();
 					}
-					paintGL();
 				} finally {
-					reentry_count--;
-					if (reentry_count == 0)
-						Context.releaseCurrentContext();
+					peer_info.unlock();
 				}
-			} finally {
-				peer_info.unlock();
+			} catch (LWJGLException e) {
+				throw new RuntimeException(e);
 			}
-		} catch (LWJGLException e) {
-			throw new RuntimeException(e);
 		}
 	}
 


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