From e58e7739379147af8c7b875f6e8a7cdb40e342bc Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 20 Jul 2012 22:05:32 +0200
Subject: Fix OSX OffscreenLayerSurface (OLS) regressions (pbuffer based)

- Use pbuffer (still), don't set FBO (invisible)

- OLS (only impl is JAWTWindow now) stores the attached layer handle
  created and attached by the GLContext implementation,
  so 'others' may detach it -> NewtCanvasAWT

- NewtCanvasAWT.removeNotify() needs to ask the OLS to detach the layer
  since it's parent will be gone.

- MacOSXCGLContext destroy allows a removed OLS (see above)
---
 src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/newt/classes')

diff --git a/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java b/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java
index 9af4a02ae..cd0e9aab6 100644
--- a/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java
+++ b/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java
@@ -42,7 +42,9 @@ import java.security.PrivilegedAction;
 import java.util.Set;
 
 import javax.media.nativewindow.NativeWindow;
+import javax.media.nativewindow.NativeWindowFactory;
 import javax.media.nativewindow.OffscreenLayerOption;
+import javax.media.nativewindow.OffscreenLayerSurface;
 import javax.media.nativewindow.WindowClosingProtocol;
 import javax.swing.MenuSelectionManager;
 
@@ -368,6 +370,10 @@ public class NewtCanvasAWT extends java.awt.Canvas implements WindowClosingProto
         if(DEBUG) {
             System.err.println("NewtCanvasAWT.removeNotify: "+newtChild+", from "+cont);
         }
+        final OffscreenLayerSurface ols = NativeWindowFactory.getOffscreenLayerSurface(newtChild, true);
+        if(null != ols && ols.isSurfaceLayerAttached()) {
+            ols.detachSurfaceLayer();
+        }      
         reparentWindow(false, cont);
         super.removeNotify();
     }
@@ -413,7 +419,7 @@ public class NewtCanvasAWT extends java.awt.Canvas implements WindowClosingProto
           // since this it is completely covered by the newtChild (z-order).
           setFocusable(true);        
       } else {
-          configureNewtChild(false);          
+          configureNewtChild(false);
           newtChild.setVisible(false);
           newtChild.reparentWindow(null);
           if(null != jawtWindow) {
@@ -445,7 +451,7 @@ public class NewtCanvasAWT extends java.awt.Canvas implements WindowClosingProto
                 NewtFactoryAWT.destroyNativeWindow(jawtWindow);
                 jawtWindow=null;
             }
-            newtChild.setVisible(false);
+            newtChild.setVisible(false);            
             newtChild.reparentWindow(null);
             newtChild.destroy();
             newtChild=null;
-- 
cgit v1.2.3