michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

AWT: Support re-entrant redrawing (by the same AWT thread). This happens when displaying dialog boxes from paintGL() or initGL()

This commit is contained in:
Elias Naur 2006-06-07 06:52:53 +00:00
parent aedb5ad912
commit 52ef6c1f64
1 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/java/org/lwjgl/opengl/AWTGLCanvas.java
View File

@ -62,6 +62,25 @@ public class AWTGLCanvas extends Canvas implements Drawable, ComponentListener,
private boolean update_context; private boolean update_context;
private Object SYNC_LOCK = new Object(); private Object SYNC_LOCK = new Object();
/** The requested pixel format */
private final PixelFormat pixel_format;
/** The drawable to share context with */
private final Drawable drawable;
/** Context handle */
private PeerInfo peer_info;
private Context context;
/**
* re-entry counter for support for re-entrant
* redrawing in paint(). It happens when using dialog boxes.
*/
private int reentry_count;
/** Tracks whether initGL() needs to be called */
private boolean first_run;
static { static {
Sys.initialize(); Sys.initialize();
String class_name; String class_name;
@ -90,16 +109,6 @@ public class AWTGLCanvas extends Canvas implements Drawable, ComponentListener,
} }
} }
/** The requested pixel format */
private final PixelFormat pixel_format;
/** The drawable to share context with */
private final Drawable drawable;
/** Context handle */
private PeerInfo peer_info;
private Context context;
private void setUpdate() { private void setUpdate() {
synchronized(SYNC_LOCK) { synchronized(SYNC_LOCK) {
@ -232,6 +241,7 @@ public class AWTGLCanvas extends Canvas implements Drawable, ComponentListener,
if (context != null) { if (context != null) {
context.forceDestroy(); context.forceDestroy();
context = null; context = null;
reentry_count = 0;
peer_info.destroy(); peer_info.destroy();
peer_info = null; peer_info = null;
} }
@ -244,7 +254,7 @@ public class AWTGLCanvas extends Canvas implements Drawable, ComponentListener,
/** /**
* Override this to do initialising of the context. * Override this to do initialising of the context.
* It will be called once from paint(), immediately after * It will be called once from paint(), immediately after
* the context is created. * the context is created and made current.
*/ */
protected void initGL() { protected void initGL() {
} }
@ -267,18 +277,26 @@ public class AWTGLCanvas extends Canvas implements Drawable, ComponentListener,
try { try {
if (context == null) { if (context == null) {
this.context = new Context(peer_info, drawable != null ? drawable.getContext() : null); this.context = new Context(peer_info, drawable != null ? drawable.getContext() : null);
context.makeCurrent(); first_run = true;
initGL();
} }
context.makeCurrent();
if (reentry_count == 0)
context.makeCurrent();
reentry_count++;
try { try {
if (update_context) { if (update_context) {
context.update(); context.update();
update_context = false; update_context = false;
} }
if (first_run) {
first_run = false;
initGL();
}
paintGL(); paintGL();
} finally { } finally {
Context.releaseCurrentContext(); reentry_count--;
if (reentry_count == 0)
Context.releaseCurrentContext();
} }
} finally { } finally {
peer_info.unlock(); peer_info.unlock();