From 1ae0737f34143a5ed655bd9c4d5fe9b0437c7774 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 22 Dec 2012 05:40:36 +0100
Subject: Fix Bug 642 TestJSplitPaneMixHwLw01AWT (AWT-GLCanvas); Robustness
 GLContext/GLDrawable

- Fix Bug 642 TestJSplitPaneMixHwLw01AWT
  On Windows platform when mixing hw/lw JSplitPanel,
  the GLCanvas is removed and added when splitter is moved.
  The lack of robustness (see below) lead to an exception.

  Note: Only w/ GLJPanel (no hw/lw mixing) the splitter can be moved
  in both direction. Only here it is guaranteed that the GL component
  will survive the action.

- Fix AWT-GLCanvas EDT Runnable: swapBuffer().. / display(..)
  - Check drawable.isRealized() within the lock on the performing thread.
    This is not possible before issuing the EDT Runnable action
    since we cannot hold the lock beforehand.

- Robustness GLDrawableImpl
  - boolean realized -> volatile boolean realized
  - remove 'synchronized' on isRealized() and setRealized(..)
  - Use dbl-checked locking on 'realized' test for swapBuffers() and setRealized(..)

- Robustness GLContextImpl
  - Catch createImpl(..) exception and properly return CONTEXT_NOT_CURRENT
---
 src/jogl/classes/jogamp/opengl/GLDrawableImpl.java | 49 ++++++++++++----------
 1 file changed, 27 insertions(+), 22 deletions(-)

(limited to 'src/jogl/classes/jogamp/opengl/GLDrawableImpl.java')

diff --git a/src/jogl/classes/jogamp/opengl/GLDrawableImpl.java b/src/jogl/classes/jogamp/opengl/GLDrawableImpl.java
index ccf0a8f0d..2d062eaf1 100644
--- a/src/jogl/classes/jogamp/opengl/GLDrawableImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLDrawableImpl.java
@@ -76,7 +76,7 @@ public abstract class GLDrawableImpl implements GLDrawable {
 
   @Override
   public final void swapBuffers() throws GLException {
-    if( !realized ) {
+    if( !realized ) { // volatile OK (locked below)
         return; // destroyed already
     }
     int lockRes = lockSurface(); // it's recursive, so it's ok within [makeCurrent .. release]
@@ -87,17 +87,19 @@ public abstract class GLDrawableImpl implements GLDrawable {
         if (NativeSurface.LOCK_SURFACE_CHANGED == lockRes) {
             updateHandle();
         }
-        final GLCapabilitiesImmutable caps = (GLCapabilitiesImmutable)surface.getGraphicsConfiguration().getChosenCapabilities();
-        if ( caps.getDoubleBuffered() ) {
-            if(!surface.surfaceSwap()) {
-                swapBuffersImpl(true);
-            }
-        } else {
-            final GLContext ctx = GLContext.getCurrent();
-            if(null!=ctx && ctx.getGLDrawable()==this) {
-                ctx.getGL().glFlush();
+        if( realized ) { // volatile OK
+            final GLCapabilitiesImmutable caps = (GLCapabilitiesImmutable)surface.getGraphicsConfiguration().getChosenCapabilities();
+            if ( caps.getDoubleBuffered() ) {
+                if(!surface.surfaceSwap()) {
+                    swapBuffersImpl(true);
+                }
+            } else {
+                final GLContext ctx = GLContext.getCurrent();
+                if(null!=ctx && ctx.getGLDrawable()==this) {
+                    ctx.getGL().glFlush();
+                }
+                swapBuffersImpl(false);
             }
-            swapBuffersImpl(false);
         }
     } finally {
         unlockSurface();
@@ -160,12 +162,11 @@ public abstract class GLDrawableImpl implements GLDrawable {
   }
 
   @Override
-  public final synchronized void setRealized(boolean realizedArg) {
-    if ( realized != realizedArg ) {
+  public final void setRealized(boolean realizedArg) {
+    if ( realized != realizedArg ) { // volatile: OK (locked below)
         if(DEBUG) {
             System.err.println(getThreadName() + ": setRealized: "+getClass().getSimpleName()+" "+realized+" -> "+realizedArg);
         }
-        realized = realizedArg;
         AbstractGraphicsDevice aDevice = surface.getGraphicsConfiguration().getScreen().getDevice();
         if(realizedArg) {
             if(surface instanceof ProxySurface) {
@@ -178,12 +179,15 @@ public abstract class GLDrawableImpl implements GLDrawable {
             aDevice.lock();
         }
         try {
-            if(realizedArg) {
-                setRealizedImpl();
-                updateHandle();
-            } else {
-                destroyHandle();
-                setRealizedImpl();
+            if ( realized != realizedArg ) { // volatile: OK
+                realized = realizedArg;
+                if(realizedArg) {
+                    setRealizedImpl();
+                    updateHandle();
+                } else {
+                    destroyHandle();
+                    setRealizedImpl();
+                }
             }
         } finally {
             if(realizedArg) {
@@ -199,6 +203,7 @@ public abstract class GLDrawableImpl implements GLDrawable {
         System.err.println(getThreadName() + ": setRealized: "+getClass().getName()+" "+this.realized+" == "+realizedArg);
     }
   }
+  
   /**
    * Platform specific realization of drawable 
    */
@@ -256,7 +261,7 @@ public abstract class GLDrawableImpl implements GLDrawable {
   }
   
   @Override
-  public final synchronized boolean isRealized() {
+  public final boolean isRealized() {
     return realized;
   }
 
@@ -306,6 +311,6 @@ public abstract class GLDrawableImpl implements GLDrawable {
   // result of calling show() on the main thread. To work around this
   // we prevent any JAWT or OpenGL operations from being done until
   // addNotify() is called on the surface.
-  protected boolean realized;
+  protected volatile boolean realized;
 
 }
-- 
cgit v1.2.3