From b738983638703bb721ee4c9820c8ef43e2252e73 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 24 Jan 2013 17:24:22 +0100
Subject: Bug 665 (part 1) - Allow dis-association of GLContext's GLDrawable ..

Changes allowing re-association (incl. null) of GLContext/GLDrawable:

- GLAutoDrawable: Refine API doc 'setContext(..)'

- GLContext: Refine API doc: 'setGLDrawable(..)' 'getGLDrawable()'

- GLContextImpl.setGLDrawable(): Handle null drawable

- GLAutoDrawableDelegate/GLAutoDrawableBase: Allow null GLContext

- GLDrawableHelper.switchContext(..)/recreateGLDrawable(): Balance GLContext.setGLDrawable(..) calls

- New GLEventListenerState, holding state vector [GLEventListener, GLContext, .. ]
  impl. relocation of all components from/to GLAutoDrawable.

- GLDrawableUtil
  - Using GLEventListenerState for swapGLContextAndAllGLEventListener(..)

+++

NEWT Window*:
  - getDisplayHandle() is 'final', no more 'shortcut' code allowed
    due to re-association incl. display handle.

  - close*:
    - close config's device (was missing)
    - null config

+++

Changes allowing reconfig of Display handle as required
to re-associate pre-existing GLContext to a 'window':

- AbstractGraphicsDevice: Add isHandleOwner() / clearHandleOwner()
  - Impl. in X11GraphicsDevice and EGLGraphicsDevice, NOP in DefaultGraphicsDevice

- DefaultGraphicsConfiguration add 'setScreen(..)'

- MutableGraphicsConfiguration
  - Make DefaultGraphicsConfiguration.setScreen(..) public

- NativeWindowFactory add 'createScreen(String type, AbstractGraphicsDevice device, int screen)'
  - Refactored from SWTAccessor

- NativeWindow x11ErrorHandler: Dump Stack Trace in DEBUG mode, always.
---
 .../com/jogamp/opengl/GLAutoDrawableDelegate.java  |   8 +-
 .../com/jogamp/opengl/util/GLDrawableUtil.java     | 116 ++-------------------
 2 files changed, 13 insertions(+), 111 deletions(-)

(limited to 'src/jogl/classes/com/jogamp')

diff --git a/src/jogl/classes/com/jogamp/opengl/GLAutoDrawableDelegate.java b/src/jogl/classes/com/jogamp/opengl/GLAutoDrawableDelegate.java
index 38a8deef8..38315dc72 100644
--- a/src/jogl/classes/com/jogamp/opengl/GLAutoDrawableDelegate.java
+++ b/src/jogl/classes/com/jogamp/opengl/GLAutoDrawableDelegate.java
@@ -65,7 +65,10 @@ import jogamp.opengl.GLDrawableImpl;
 public class GLAutoDrawableDelegate extends GLAutoDrawableBase implements GLAutoDrawable {
     /**
      * @param drawable a valid and already realized {@link GLDrawable}
-     * @param context a valid {@link GLContext}, may not be made current (created) yet.
+     * @param context a valid {@link GLContext}, 
+     *                may not have been made current (created) yet,
+     *                may not be associated w/ <code>drawable<code> yet, 
+     *                may be <code>null</code> for lazy initialization
      * @param upstreamWidget optional UI element holding this instance, see {@link #getUpstreamWidget()}.
      * @param ownDevice pass <code>true</code> if {@link AbstractGraphicsDevice#close()} shall be issued,
      *                  otherwise pass <code>false</code>. Closing the device is required in case
@@ -78,9 +81,6 @@ public class GLAutoDrawableDelegate extends GLAutoDrawableBase implements GLAuto
         if(null == drawable) {
             throw new IllegalArgumentException("null drawable");
         }
-        if(null == context) {
-            throw new IllegalArgumentException("null context");
-        }        
         if(!drawable.isRealized()) {
             throw new IllegalArgumentException("drawable not realized");
         }
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLDrawableUtil.java b/src/jogl/classes/com/jogamp/opengl/util/GLDrawableUtil.java
index cc81e4820..c03e4bfa4 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/GLDrawableUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLDrawableUtil.java
@@ -27,17 +27,14 @@
  */
 package com.jogamp.opengl.util;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.media.opengl.GLAnimatorControl;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLContext;
 import javax.media.opengl.GLDrawable;
 import javax.media.opengl.GLEventListener;
-import javax.media.opengl.GLRunnable;
 
 import jogamp.opengl.Debug;
+import jogamp.opengl.GLEventListenerState;
 
 /**
  * Providing utility functions dealing w/ {@link GLDrawable}s, {@link GLAutoDrawable} and their {@link GLEventListener}.
@@ -83,7 +80,7 @@ public class GLDrawableUtil {
     dest.addGLEventListener(listener);
     if(preserveInitState && initialized) {
         dest.setGLEventListenerInitState(listener, true);
-        dest.invoke(false, new ReshapeGLEventListener(listener));
+        dest.invoke(false, new GLEventListenerState.ReshapeGLEventListener(listener));
     } // else .. !init state is default
   }
   
@@ -121,108 +118,13 @@ public class GLDrawableUtil {
    * @param b
    */
   public static final void swapGLContextAndAllGLEventListener(GLAutoDrawable a, GLAutoDrawable b) {
-    final List<GLRunnable> aGLCmds = new ArrayList<GLRunnable>();
-    final List<GLRunnable> bGLCmds = new ArrayList<GLRunnable>();
-    final GLAnimatorControl aAnim = a.getAnimator();
-    final GLAnimatorControl bAnim = b.getAnimator();    
-    final boolean aIsPaused = isAnimatorAnimatingOnOtherThread(aAnim) && aAnim.pause();
-    final boolean bIsPaused = isAnimatorAnimatingOnOtherThread(bAnim) && bAnim.pause();
-    
-    //
-    // remove and cache all GLEventListener and their init-state
-    //
-    final int aSz = a.getGLEventListenerCount();
-    final GLEventListener[] aGLE = new GLEventListener[aSz];
-    final boolean[] aInit = new boolean[aSz];
-    for(int i=0; i<aSz; i++) {
-        final GLEventListener l = a.getGLEventListener(0);
-        aInit[i] = a.getGLEventListenerInitState(l);
-        aGLE[i] = a.removeGLEventListener( l );
-    }    
-    final int bSz = b.getGLEventListenerCount();
-    final GLEventListener[] bGLE = new GLEventListener[bSz];
-    final boolean[] bInit = new boolean[bSz];
-    for(int i=0; i<bSz; i++) {
-        final GLEventListener l = b.getGLEventListener(0);
-        bInit[i] = b.getGLEventListenerInitState(l);
-        bGLE[i] = b.removeGLEventListener( l );
-    }
-    
-    //
-    // trigger glFinish to sync GL ctx
-    //
-    a.invoke(true, glFinish);
-    b.invoke(true, glFinish);
-    
-    //
-    // switch context and
-    // trigger GL-Viewport reset and reshape of all initialized GLEventListeners
-    //
-    b.setContext( a.setContext( b.getContext() ) );
-    aGLCmds.add(setViewport);
-    bGLCmds.add(setViewport);
-    for(int i=0; i<aSz; i++) {
-        if( aInit[i] ) {
-            bGLCmds.add(new ReshapeGLEventListener(aGLE[i]));
-        }
-    }    
-    for(int i=0; i<bSz; i++) {
-        if( bInit[i] ) {
-            aGLCmds.add(new ReshapeGLEventListener(bGLE[i]));
-        }
-    }
-    aGLCmds.add(glFinish);
-    bGLCmds.add(glFinish);
-    a.invoke(true, aGLCmds);
-    b.invoke(true, bGLCmds);
-    
-    // add all cached GLEventListener to their destination and fix their init-state
-    for(int i=0; i<bSz; i++) {
-        final GLEventListener l = bGLE[i];
-        a.addGLEventListener( l );
-        if( bInit[i] ) {
-            a.setGLEventListenerInitState(l, true);
-        } // else uninitialized is default after add
-    }    
-    for(int i=0; i<aSz; i++) {
-        final GLEventListener l = aGLE[i];
-        b.addGLEventListener( l );
-        if( aInit[i] ) {
-            b.setGLEventListenerInitState(l, true);
-        } // else uninitialized is default after add
-    }
+    final GLEventListenerState gllsA = GLEventListenerState.moveFrom(a);
+    final GLEventListenerState gllsB = GLEventListenerState.moveFrom(b);
     
-    if(aIsPaused) { aAnim.resume(); }
-    if(bIsPaused) { bAnim.resume(); }
+    gllsA.moveTo(b);
+    gllsB.moveTo(a);
   }
   
-  static GLRunnable setViewport = new GLRunnable() {
-    @Override
-    public boolean run(GLAutoDrawable drawable) {
-        drawable.getGL().glViewport(0, 0, drawable.getWidth(), drawable.getHeight());
-        return true;
-    }            
-  };
-  static GLRunnable glFinish = new GLRunnable() {
-    @Override
-    public boolean run(GLAutoDrawable drawable) {
-        drawable.getGL().glFinish();
-        return true;
-    }            
-  };
-  
-  private static class ReshapeGLEventListener implements GLRunnable {
-    private GLEventListener listener;
-    ReshapeGLEventListener(GLEventListener listener) {
-        this.listener = listener;
-    }
-    @Override
-    public boolean run(GLAutoDrawable drawable) {
-        listener.reshape(drawable, 0, 0, drawable.getWidth(), drawable.getHeight());
-        return true;
-    }      
-  }
-
   /** 
    * Swaps the {@link GLContext} of given {@link GLAutoDrawable} 
    * and {@link GLAutoDrawable#disposeGLEventListener(GLEventListener, boolean) disposes} 
@@ -251,11 +153,11 @@ public class GLDrawableUtil {
     }
     dest.setContext( src.setContext( dest.getContext() ) );
     
-    src.invoke(true, setViewport);
-    dest.invoke(true, setViewport);
+    src.invoke(true, GLEventListenerState.setViewport);
+    dest.invoke(true, GLEventListenerState.setViewport);
     
     if(aIsPaused) { aAnim.resume(); }
     if(bIsPaused) { bAnim.resume(); }
   }
-
+    
 }
-- 
cgit v1.2.3