Fix GLAutoDrawable.dispose(): Dispose drawable even w/o context; JAWTWindow.lockSurface(): Check AWT component's native peer

- Fix GLAutoDrawable.dispose(): Dispose drawable even w/o context
  - It is possible to have the GLContext not being created (not made current),
    so drawable shall be disposed independent.

  - Merge Runnable 'postDisposeOnEDTAction' to dispose Runnable for clarity

  - GLDrawableHelper: Split disposeGL from invokeGLImpl for clarity

- JAWTWindow.lockSurface(): Check AWT component's native peer
  - W/o a native peer (!isDisplayable()), JAWT locking cannot succeed.

  - On OSX OpenJDK 1.7, attempting to JAWT lock a peer-less component crashes the VM

  - MacOSXJAWTWindow.lockSurfaceImpl(): Remove redundant null checks

1 files changed, 86 insertions, 95 deletions

diff --git a/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java b/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java
index 36dc933ab..f7f846b05 100644
--- a/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java
+++ b/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java
@@ -397,8 +397,8 @@ public class GLDrawableHelper {
    * otherwise maked uninitialized.
    * </p>
    * <p>
-   * Please consider using {@link #disposeAllGLEventListener(GLAutoDrawable, GLDrawable, GLContext)} 
-   * or {@link #disposeGL(GLAutoDrawable, GLDrawable, GLContext, Runnable)}
+   * Please consider using {@link #disposeAllGLEventListener(GLAutoDrawable, GLContext, boolean)}
+   * or {@link #disposeGL(GLAutoDrawable, GLContext)}
    * for correctness, i.e. encapsulating all calls w/ makeCurrent etc.
    * </p>
    * @param autoDrawable
@@ -483,8 +483,7 @@ public class GLDrawableHelper {
    * 
    * @param autoDrawable
    * @param context
-   * @param listener
-   * @param initAction
+   * @param remove
    */
   public final void disposeAllGLEventListener(final GLAutoDrawable autoDrawable,
                                               final GLDrawable drawable,
@@ -505,29 +504,6 @@ public class GLDrawableHelper {
       }
   }
   
-  /** 
-   * Principal helper method which runs 
-   * {@link #disposeAllGLEventListener(GLAutoDrawable, boolean) disposeAllGLEventListener(autoDrawable, false)} 
-   * with the context made current <b>and</b> destroys the context afterwards while holding the lock.
-   * @param autoDrawable
-   * @param drawable
-   * @param context
-   * @param postAction
-   */
-  public final void disposeGL(final GLAutoDrawable autoDrawable,
-                              final GLDrawable drawable,
-                              final GLContext context,
-                              final Runnable postAction) {
-    if(PERF_STATS) {
-        invokeGLImplStats(drawable, context, null, null, autoDrawable);    
-    } else {
-        invokeGLImpl(drawable, context, null, null, autoDrawable);
-    }
-    if(null != postAction) {
-        postAction.run();
-    }
-  }
-      
   private final void init(GLEventListener l, GLAutoDrawable drawable, boolean sendReshape) {
       l.init(drawable);
       if(sendReshape) {
@@ -842,21 +818,66 @@ public class GLDrawableHelper {
     }
 
     if(PERF_STATS) {
-        invokeGLImplStats(drawable, context, runnable, initAction, null);    
+        invokeGLImplStats(drawable, context, runnable, initAction);    
     } else {
-        invokeGLImpl(drawable, context, runnable, initAction, null);
+        invokeGLImpl(drawable, context, runnable, initAction);
     }
   }
 
+  /** 
+   * Principal helper method which runs 
+   * {@link #disposeAllGLEventListener(GLAutoDrawable, boolean) disposeAllGLEventListener(autoDrawable, false)} 
+   * with the context made current <b>and</b> destroys the context afterwards while holding the lock.
+   * @param autoDrawable
+   * @param context
+   */
+  public final void disposeGL(final GLAutoDrawable autoDrawable,
+                              final GLContext context) {
+    // Support for recursive makeCurrent() calls as well as calling
+    // other drawables' display() methods from within another one's
+    GLContext lastContext = GLContext.getCurrent();
+    Runnable  lastInitAction = null;
+    if (lastContext != null) {
+        if (lastContext == context) {
+            lastContext = null; // utilize recursive locking
+        } else {
+            lastInitAction = perThreadInitAction.get();
+            lastContext.release();
+        }
+    }
+    int res = GLContext.CONTEXT_NOT_CURRENT;
+  
+    try {
+      res = context.makeCurrent();
+      if (GLContext.CONTEXT_NOT_CURRENT != res) {
+        if(GLContext.CONTEXT_CURRENT_NEW == res) {
+            throw new GLException(Thread.currentThread().getName()+" GLDrawableHelper " + this + ".invokeGL(): Dispose case (no init action given): Native context was not created (new ctx): "+context);
+        }
+        if( listeners.size() > 0 && null != autoDrawable ) {
+            disposeAllGLEventListener(autoDrawable, false);
+        }
+      }
+    } finally {
+      try {
+          context.destroy();
+          flushGLRunnables();
+      } catch (Exception e) {
+          System.err.println("Catched: "+e.getMessage());
+          e.printStackTrace();
+      }
+      if (lastContext != null) {
+        final int res2 = lastContext.makeCurrent();
+        if (null != lastInitAction && res2 == GLContext.CONTEXT_CURRENT_NEW) {
+          lastInitAction.run();
+        }
+      }
+    }
+  }
+      
   private final void invokeGLImpl(final GLDrawable drawable,
                                   final GLContext context,
                                   final Runnable  runnable,
-                                  final Runnable  initAction,
-                                  final GLAutoDrawable disposeAutoDrawable) {
-    final Thread currentThread = Thread.currentThread();
-    
-    final boolean isDisposeAction = null==initAction ;
-        
+                                  final Runnable  initAction) {                                  
     // Support for recursive makeCurrent() calls as well as calling
     // other drawables' display() methods from within another one's
     GLContext lastContext = GLContext.getCurrent();
@@ -874,35 +895,21 @@ public class GLDrawableHelper {
     try {
       res = context.makeCurrent();
       if (GLContext.CONTEXT_NOT_CURRENT != res) {
-        if(!isDisposeAction) {
-            perThreadInitAction.set(initAction);
-            if (GLContext.CONTEXT_CURRENT_NEW == res) {
-              if (DEBUG) {
-                System.err.println("GLDrawableHelper " + this + ".invokeGL(): Running initAction");
-              }
-              initAction.run();
-            }
-            runnable.run();
-            if (autoSwapBufferMode) {
-                drawable.swapBuffers();
-            }
-        } else {
-            if(GLContext.CONTEXT_CURRENT_NEW == res) {
-                throw new GLException(currentThread.getName()+" GLDrawableHelper " + this + ".invokeGL(): Dispose case (no init action given): Native context was not created (new ctx): "+context);
-            }
-            if( listeners.size() > 0 && null != disposeAutoDrawable ) {
-                disposeAllGLEventListener(disposeAutoDrawable, false);
-            }
+        perThreadInitAction.set(initAction);
+        if (GLContext.CONTEXT_CURRENT_NEW == res) {
+          if (DEBUG) {
+            System.err.println("GLDrawableHelper " + this + ".invokeGL(): Running initAction");
+          }
+          initAction.run();
+        }
+        runnable.run();
+        if ( autoSwapBufferMode ) {
+            drawable.swapBuffers();
         }
       }
     } finally {
       try {
-          if(isDisposeAction) {
-              context.destroy();
-              flushGLRunnables();
-          } else if( GLContext.CONTEXT_NOT_CURRENT != res ) {
-              context.release();
-          }
+          context.release();
       } catch (Exception e) {
           System.err.println("Catched: "+e.getMessage());
           e.printStackTrace();
@@ -919,12 +926,9 @@ public class GLDrawableHelper {
   private final void invokeGLImplStats(final GLDrawable drawable,
                                        final GLContext context,
                                        final Runnable  runnable,
-                                       final Runnable  initAction,
-                                       final GLAutoDrawable disposeAutoDrawable) {
+                                       final Runnable  initAction) {
     final Thread currentThread = Thread.currentThread();
     
-    final boolean isDisposeAction = null==initAction ;
-    
     // Support for recursive makeCurrent() calls as well as calling
     // other drawables' display() methods from within another one's
     int res = GLContext.CONTEXT_NOT_CURRENT;
@@ -956,41 +960,28 @@ public class GLDrawableHelper {
           ctxClaimed = true;
       }
       if (res != GLContext.CONTEXT_NOT_CURRENT) {
-        if(!isDisposeAction) {
-            perThreadInitAction.set(initAction);
-            if (res == GLContext.CONTEXT_CURRENT_NEW) {
-              if (DEBUG) {
-                System.err.println("GLDrawableHelper " + this + ".invokeGL(): Running initAction");
-              }
-              initAction.run();
-            }
-            tdR = System.currentTimeMillis();        
-            tdA = tdR - t0; // makeCurrent
-            runnable.run();
-            tdS = System.currentTimeMillis();
-            tdR = tdS - tdR; // render time
-            if (autoSwapBufferMode) {
-                drawable.swapBuffers();
-                tdX = System.currentTimeMillis();
-                tdS = tdX - tdS; // swapBuffers
-            }
-        } else {
-            if(res == GLContext.CONTEXT_CURRENT_NEW) {
-                throw new GLException(currentThread.getName()+" GLDrawableHelper " + this + ".invokeGL(): Dispose case (no init action given): Native context was not created (new ctx): "+context);
-            }
-            if( listeners.size() > 0 && null != disposeAutoDrawable ) {
-                disposeAllGLEventListener(disposeAutoDrawable, false);
-            }
+        perThreadInitAction.set(initAction);
+        if (res == GLContext.CONTEXT_CURRENT_NEW) {
+          if (DEBUG) {
+            System.err.println("GLDrawableHelper " + this + ".invokeGL(): Running initAction");
+          }
+          initAction.run();
+        }
+        tdR = System.currentTimeMillis();        
+        tdA = tdR - t0; // makeCurrent
+        runnable.run();
+        tdS = System.currentTimeMillis();
+        tdR = tdS - tdR; // render time
+        if (autoSwapBufferMode) {
+            drawable.swapBuffers();
+            tdX = System.currentTimeMillis();
+            tdS = tdX - tdS; // swapBuffers
         }
       }
     } finally {
       try {
-          if(isDisposeAction) {
-              context.destroy();
-              flushGLRunnables();
-              ctxDestroyed = true;
-          } else if( res != GLContext.CONTEXT_NOT_CURRENT &&
-                     (null == skipContextReleaseThread || currentThread != skipContextReleaseThread) ) {
+          if( res != GLContext.CONTEXT_NOT_CURRENT &&
+              (null == skipContextReleaseThread || currentThread != skipContextReleaseThread) ) {
               context.release();
               ctxReleased = true;
           }