GLSL DataArray/Handler: Remove ShaderState state and pass it through: ShaderState.getShaderState(gl)

This removes the dependency of a GLSL GLDataArray object to a specific ShaderState
and enables sharing of this VBO data, i.e. via a shared context.

Test: TestSharedContextVBOES2NEWT

14 files changed, 458 insertions, 64 deletions

diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListAWT.java
index f46b4150e..fe7475448 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListAWT.java
@@ -83,7 +83,7 @@ public class TestSharedContextListAWT extends UITestCase {
         return new Frame("Shared Gears AWT Test: "+x+"/"+y+" shared "+useShared);
     }
 
-    protected GLCanvas runTestGL(final Frame frame, final Animator animator, final int x, final int y, final boolean useShared)
+    protected GLCanvas runTestGL(final Frame frame, final Animator animator, final int x, final int y, final boolean useShared, final boolean vsync)
             throws InterruptedException
     {
         final GLCanvas glCanvas = new GLCanvas(caps, useShared ? sharedDrawable.getContext() : null);        
@@ -92,7 +92,7 @@ public class TestSharedContextListAWT extends UITestCase {
         frame.setLocation(x, y);
         frame.setSize(width, height);
         
-        Gears gears = new Gears();
+        Gears gears = new Gears(vsync ? 1 : 0);
         if(useShared) {
             gears.setGears(sharedGears.getGear1(), sharedGears.getGear2(), sharedGears.getGear3());
         }
@@ -116,9 +116,9 @@ public class TestSharedContextListAWT extends UITestCase {
 
         Animator animator = new Animator();
 
-        GLCanvas glc1 = runTestGL(f1, animator, 0,     0,      true);
-        GLCanvas glc2 = runTestGL(f2, animator, width, 0,      true);
-        GLCanvas glc3 = runTestGL(f3, animator, 0,     height, false);
+        GLCanvas glc1 = runTestGL(f1, animator, 0,     0,      true, false);
+        GLCanvas glc2 = runTestGL(f2, animator, width, 0,      true, false);
+        GLCanvas glc3 = runTestGL(f3, animator, 0,     height, false, true);
 
         animator.setUpdateFPSFrames(1, null);        
         animator.start();
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListNEWT.java
index ede06b526..231a45ca0 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListNEWT.java
@@ -77,7 +77,7 @@ public class TestSharedContextListNEWT extends UITestCase {
         sharedDrawable.destroy();
     }
 
-    protected GLWindow runTestGL(Animator animator, int x, int y, boolean useShared) {
+    protected GLWindow runTestGL(Animator animator, int x, int y, boolean useShared, boolean vsync) {
         GLWindow glWindow = GLWindow.create(caps);
         Assert.assertNotNull(glWindow);
         glWindow.setTitle("Shared Gears NEWT Test: "+x+"/"+y+" shared "+useShared);
@@ -88,7 +88,7 @@ public class TestSharedContextListNEWT extends UITestCase {
         glWindow.setSize(width, height);
         glWindow.setPosition(x, y);
 
-        Gears gears = new Gears();
+        Gears gears = new Gears(vsync ? 1 : 0);
         if(useShared) {
             gears.setGears(sharedGears.getGear1(), sharedGears.getGear2(), sharedGears.getGear3());
         }
@@ -105,9 +105,9 @@ public class TestSharedContextListNEWT extends UITestCase {
     public void test01() throws InterruptedException {
         initShared();
         Animator animator = new Animator();
-        GLWindow f1 = runTestGL(animator, 0, 0, true);
-        GLWindow f2 = runTestGL(animator, width, 0, true);
-        GLWindow f3 = runTestGL(animator, 0, height, false);
+        GLWindow f1 = runTestGL(animator, 0, 0, true, false);
+        GLWindow f2 = runTestGL(animator, width, 0, true, false);
+        GLWindow f3 = runTestGL(animator, 0, height, false, true);
         animator.setUpdateFPSFrames(1, null);        
         animator.start();
         while(animator.isAnimating() && animator.getTotalFPSDuration()<duration) {
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES1NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES1NEWT.java
new file mode 100644
index 000000000..c230ffd6d
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES1NEWT.java
@@ -0,0 +1,142 @@
+/**
+ * Copyright 2010 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+ 
+package com.jogamp.opengl.test.junit.jogl.acore;
+
+import com.jogamp.newt.opengl.GLWindow;
+
+import javax.media.opengl.GLCapabilities;
+import javax.media.opengl.GLDrawableFactory;
+import javax.media.opengl.GLPbuffer;
+import javax.media.opengl.GLProfile;
+import com.jogamp.opengl.util.Animator;
+
+import com.jogamp.opengl.test.junit.util.UITestCase;
+import com.jogamp.opengl.test.junit.jogl.demos.es1.GearsES1;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class TestSharedContextVBOES1NEWT extends UITestCase {
+    static GLProfile glp;
+    static GLCapabilities caps;
+    static int width, height;
+    GLPbuffer sharedDrawable;
+    GearsES1 sharedGears;
+
+    @BeforeClass
+    public static void initClass() {
+        GLProfile.initSingleton(true);
+        glp = GLProfile.getDefault();
+        Assert.assertNotNull(glp);
+        caps = new GLCapabilities(glp);
+        Assert.assertNotNull(caps);
+        width  = 512;
+        height = 512;
+    }
+
+    private void initShared() {
+        sharedDrawable = GLDrawableFactory.getFactory(glp).createGLPbuffer(null, caps, null, width, height, null);
+        Assert.assertNotNull(sharedDrawable);
+        sharedGears = new GearsES1();
+        Assert.assertNotNull(sharedGears);
+        sharedDrawable.addGLEventListener(sharedGears);
+        // init and render one frame, which will setup the Gears display lists
+        sharedDrawable.display();
+    }
+
+    private void releaseShared() {
+        Assert.assertNotNull(sharedDrawable);
+        sharedDrawable.destroy();
+    }
+
+    protected GLWindow runTestGL(Animator animator, int x, int y, boolean useShared, boolean vsync) {
+        GLWindow glWindow = GLWindow.create(caps);
+        Assert.assertNotNull(glWindow);
+        glWindow.setTitle("Shared Gears NEWT Test: "+x+"/"+y+" shared "+useShared);
+        if(useShared) {
+            glWindow.setSharedContext(sharedDrawable.getContext());
+        }
+
+        glWindow.setSize(width, height);
+        glWindow.setPosition(x, y);
+
+        GearsES1 gears = new GearsES1(vsync ? 1 : 0);
+        if(useShared) {
+            gears.setGears(sharedGears.getGear1(), sharedGears.getGear2(), sharedGears.getGear3());
+        }
+        glWindow.addGLEventListener(gears);
+
+        animator.add(glWindow);
+
+        glWindow.setVisible(true);
+
+        return glWindow;
+    }
+
+    @Test
+    public void test01() throws InterruptedException {
+        initShared();
+        Animator animator = new Animator();
+        GLWindow f1 = runTestGL(animator, 0, 0, true, false);
+        GLWindow f2 = runTestGL(animator, width, 0, true, false);
+        GLWindow f3 = runTestGL(animator, 0, height, false, true);
+        animator.setUpdateFPSFrames(1, null);        
+        animator.start();
+        while(animator.isAnimating() && animator.getTotalFPSDuration()<duration) {
+            Thread.sleep(100);
+        }
+        animator.stop();
+
+        // here we go again: On AMD/X11 the create/destroy sequence must be the same
+        // even though this is agains the chicken/egg logic here ..
+        releaseShared();
+
+        f1.destroy();
+        f2.destroy();
+        f3.destroy();
+
+        // see above ..
+        // releaseShared();
+    }
+
+    static long duration = 500; // ms
+
+    public static void main(String args[]) {
+        for(int i=0; i<args.length; i++) {
+            if(args[i].equals("-time")) {
+                i++;
+                try {
+                    duration = Integer.parseInt(args[i]);
+                } catch (Exception ex) { ex.printStackTrace(); }
+            }
+        }
+        org.junit.runner.JUnitCore.main(TestSharedContextVBOES1NEWT.class.getName());
+    }
+}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES2NEWT.java
new file mode 100644
index 000000000..602f5c3b5
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES2NEWT.java
@@ -0,0 +1,142 @@
+/**
+ * Copyright 2010 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+ 
+package com.jogamp.opengl.test.junit.jogl.acore;
+
+import com.jogamp.newt.opengl.GLWindow;
+
+import javax.media.opengl.GLCapabilities;
+import javax.media.opengl.GLDrawableFactory;
+import javax.media.opengl.GLPbuffer;
+import javax.media.opengl.GLProfile;
+import com.jogamp.opengl.util.Animator;
+
+import com.jogamp.opengl.test.junit.util.UITestCase;
+import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class TestSharedContextVBOES2NEWT extends UITestCase {
+    static GLProfile glp;
+    static GLCapabilities caps;
+    static int width, height;
+    GLPbuffer sharedDrawable;
+    GearsES2 sharedGears;
+
+    @BeforeClass
+    public static void initClass() {
+        GLProfile.initSingleton(true);
+        glp = GLProfile.getDefault();
+        Assert.assertNotNull(glp);
+        caps = new GLCapabilities(glp);
+        Assert.assertNotNull(caps);
+        width  = 512;
+        height = 512;
+    }
+
+    private void initShared() {
+        sharedDrawable = GLDrawableFactory.getFactory(glp).createGLPbuffer(null, caps, null, width, height, null);
+        Assert.assertNotNull(sharedDrawable);
+        sharedGears = new GearsES2();
+        Assert.assertNotNull(sharedGears);
+        sharedDrawable.addGLEventListener(sharedGears);
+        // init and render one frame, which will setup the Gears display lists
+        sharedDrawable.display();
+    }
+
+    private void releaseShared() {
+        Assert.assertNotNull(sharedDrawable);
+        sharedDrawable.destroy();
+    }
+
+    protected GLWindow runTestGL(Animator animator, int x, int y, boolean useShared, boolean vsync) {
+        GLWindow glWindow = GLWindow.create(caps);
+        Assert.assertNotNull(glWindow);
+        glWindow.setTitle("Shared Gears NEWT Test: "+x+"/"+y+" shared "+useShared);
+        if(useShared) {
+            glWindow.setSharedContext(sharedDrawable.getContext());            
+        }
+
+        glWindow.setSize(width, height);
+        glWindow.setPosition(x, y);
+
+        GearsES2 gears = new GearsES2(vsync ? 1 : 0);
+        if(useShared) {
+            gears.setGears(sharedGears.getGear1(), sharedGears.getGear2(), sharedGears.getGear3());
+        }
+        glWindow.addGLEventListener(gears);
+
+        animator.add(glWindow);
+
+        glWindow.setVisible(true);
+
+        return glWindow;
+    }
+
+    @Test
+    public void test01() throws InterruptedException {
+        initShared();
+        Animator animator = new Animator();
+        GLWindow f1 = runTestGL(animator, 0, 0, true, false);
+        GLWindow f2 = runTestGL(animator, width, 0, true, false);
+        GLWindow f3 = runTestGL(animator, 0, height, false, true);
+        animator.setUpdateFPSFrames(1, null);        
+        animator.start();
+        while(animator.isAnimating() && animator.getTotalFPSDuration()<duration) {
+            Thread.sleep(100);
+        }
+        animator.stop();
+
+        // here we go again: On AMD/X11 the create/destroy sequence must be the same
+        // even though this is agains the chicken/egg logic here ..
+        releaseShared();
+
+        f1.destroy();
+        f2.destroy();
+        f3.destroy();
+
+        // see above ..
+        // releaseShared();
+    }
+
+    static long duration = 500; // ms
+
+    public static void main(String args[]) {
+        for(int i=0; i<args.length; i++) {
+            if(args[i].equals("-time")) {
+                i++;
+                try {
+                    duration = Integer.parseInt(args[i]);
+                } catch (Exception ex) { ex.printStackTrace(); }
+            }
+        }
+        org.junit.runner.JUnitCore.main(TestSharedContextVBOES2NEWT.class.getName());
+    }
+}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/GearsObject.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/GearsObject.java
index 19c207f80..5ad3b3894 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/GearsObject.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/GearsObject.java
@@ -44,9 +44,19 @@ public abstract class GearsObject {
     public final GLArrayDataServer outwardFace;
     public final GLArrayDataServer insideRadiusCyl;
 
+    public abstract GLArrayDataServer createInterleaved(int comps, int dataType, boolean normalized, int initialSize, int vboUsage);
     public abstract void addInterleavedVertexAndNormalArrays(GLArrayDataServer array, int components);
     public abstract void draw(GL gl, float x, float y, float angle, FloatBuffer color);
     
+    public GearsObject ( GearsObject shared ) {
+        frontFace = shared.frontFace;
+        frontSide = shared.frontSide;
+        backFace = shared.backFace;
+        backSide = shared.backSide;
+        outwardFace = shared.outwardFace;
+        insideRadiusCyl = shared.insideRadiusCyl;
+    }
+            
     public GearsObject (
             float inner_radius,
             float outer_radius,
@@ -73,19 +83,17 @@ public abstract class GearsObject {
         s[4] = 0; // sin(0f)
         c[4] = 1; // cos(0f)
 
-        System.err.println("teeth: "+teeth);
-
-        frontFace = GLArrayDataServer.createInterleaved(6, GL.GL_FLOAT, false, 4*teeth+2, GL.GL_STATIC_DRAW);
+        frontFace = createInterleaved(6, GL.GL_FLOAT, false, 4*teeth+2, GL.GL_STATIC_DRAW);
         addInterleavedVertexAndNormalArrays(frontFace, 3);
-        backFace = GLArrayDataServer.createInterleaved(6, GL.GL_FLOAT, false, 4*teeth+2, GL.GL_STATIC_DRAW);
+        backFace = createInterleaved(6, GL.GL_FLOAT, false, 4*teeth+2, GL.GL_STATIC_DRAW);
         addInterleavedVertexAndNormalArrays(backFace, 3);
-        frontSide = GLArrayDataServer.createInterleaved(6, GL.GL_FLOAT, false, 6*teeth, GL.GL_STATIC_DRAW);
+        frontSide = createInterleaved(6, GL.GL_FLOAT, false, 6*teeth, GL.GL_STATIC_DRAW);
         addInterleavedVertexAndNormalArrays(frontSide, 3);
-        backSide = GLArrayDataServer.createInterleaved(6, GL.GL_FLOAT, false, 6*teeth, GL.GL_STATIC_DRAW);
+        backSide = createInterleaved(6, GL.GL_FLOAT, false, 6*teeth, GL.GL_STATIC_DRAW);
         addInterleavedVertexAndNormalArrays(backSide, 3);
-        outwardFace = GLArrayDataServer.createInterleaved(6, GL.GL_FLOAT, false, 4*4*teeth+2, GL.GL_STATIC_DRAW);
+        outwardFace = createInterleaved(6, GL.GL_FLOAT, false, 4*4*teeth+2, GL.GL_STATIC_DRAW);
         addInterleavedVertexAndNormalArrays(outwardFace, 3);
-        insideRadiusCyl = GLArrayDataServer.createInterleaved(6, GL.GL_FLOAT, false, 2*teeth+2, GL.GL_STATIC_DRAW);
+        insideRadiusCyl = createInterleaved(6, GL.GL_FLOAT, false, 2*teeth+2, GL.GL_STATIC_DRAW);
         addInterleavedVertexAndNormalArrays(insideRadiusCyl, 3);
 
         for (i = 0; i < teeth; i++) {
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsES1.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsES1.java
index dfac46482..07b2df813 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsES1.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsES1.java
@@ -34,8 +34,6 @@ import com.jogamp.newt.event.KeyListener;
 import com.jogamp.newt.event.MouseAdapter;
 import com.jogamp.newt.event.MouseEvent;
 import com.jogamp.newt.event.MouseListener;
-import com.jogamp.newt.event.awt.AWTKeyAdapter;
-import com.jogamp.newt.event.awt.AWTMouseAdapter;
 import com.jogamp.opengl.test.junit.jogl.demos.GearsObject;
 
 /**
@@ -60,6 +58,27 @@ public class GearsES1 implements GLEventListener {
     this.swapInterval = 1;
   }
   
+  public void setGears(GearsObject g1, GearsObject g2, GearsObject g3) {
+      gear1 = g1;
+      gear2 = g2;
+      gear3 = g3;
+  }
+
+  /**
+   * @return gear1
+   */
+  public GearsObject getGear1() { return gear1; }
+
+  /**
+   * @return gear2
+   */
+  public GearsObject getGear2() { return gear2; }
+
+  /**
+   * @return gear3
+   */
+  public GearsObject getGear3() { return gear3; }
+  
   public void init(GLAutoDrawable drawable) {
     System.err.println("Gears: Init: "+drawable);
     // Use debug pipeline
@@ -115,8 +134,8 @@ public class GearsES1 implements GLEventListener {
         window.addKeyListener(gearsKeys);
     } else if (GLProfile.isAWTAvailable() && drawable instanceof java.awt.Component) {
         java.awt.Component comp = (java.awt.Component) drawable;
-        new AWTMouseAdapter(gearsMouse).addTo(comp);
-        new AWTKeyAdapter(gearsKeys).addTo(comp);
+        new com.jogamp.newt.event.awt.AWTMouseAdapter(gearsMouse).addTo(comp);
+        new com.jogamp.newt.event.awt.AWTKeyAdapter(gearsKeys).addTo(comp);
     }
   }
     
@@ -150,7 +169,16 @@ public class GearsES1 implements GLEventListener {
 
     gl.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 
-    gl.glClear(GL2ES1.GL_COLOR_BUFFER_BIT | GL2ES1.GL_DEPTH_BUFFER_BIT);
+    // Special handling for the case where the GLJPanel is translucent
+    // and wants to be composited with other Java 2D content
+    if (GLProfile.isAWTAvailable() && 
+        (drawable instanceof javax.media.opengl.awt.GLJPanel) &&
+        !((javax.media.opengl.awt.GLJPanel) drawable).isOpaque() &&
+        ((javax.media.opengl.awt.GLJPanel) drawable).shouldPreserveColorBufferIfTranslucent()) {
+      gl.glClear(GL.GL_DEPTH_BUFFER_BIT);
+    } else {
+      gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+    }
 
     gl.glNormal3f(0.0f, 0.0f, 1.0f);
     
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsObjectES1.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsObjectES1.java
index 3d93edbaf..2409ecdcb 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsObjectES1.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsObjectES1.java
@@ -42,6 +42,11 @@ public class GearsObjectES1 extends GearsObject {
     }
 
     @Override
+    public GLArrayDataServer createInterleaved(int comps, int dataType, boolean normalized, int initialSize, int vboUsage) {
+        return GLArrayDataServer.createFixedInterleaved(comps, dataType, normalized, initialSize, vboUsage);
+    }
+    
+    @Override
     public void addInterleavedVertexAndNormalArrays(GLArrayDataServer array,
             int components) {
         array.addFixedSubArray(GLPointerFunc.GL_VERTEX_ARRAY, 3, GL.GL_ARRAY_BUFFER);
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/ElektronenMultiplizierer.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/ElektronenMultiplizierer.java
index f484dbf72..a1233b2a6 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/ElektronenMultiplizierer.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/ElektronenMultiplizierer.java
@@ -194,7 +194,7 @@ public class ElektronenMultiplizierer implements GLEventListener {
         st.ownUniform(pmvMatrixUniform);
         st.uniform(gl, pmvMatrixUniform);
                  
-        vertices0 = GLArrayDataServer.createGLSL(st, "gca_Vertices", 2, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
+        vertices0 = GLArrayDataServer.createGLSL("gca_Vertices", 2, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
         vertices0.putf(0);     vertices0.putf(YRESf);
         vertices0.putf(XRESf); vertices0.putf(YRESf);
         vertices0.putf(0);     vertices0.putf(0);
@@ -203,7 +203,7 @@ public class ElektronenMultiplizierer implements GLEventListener {
         st.ownAttribute(vertices0, true);
         vertices0.enableBuffer(gl, false);
         
-        texCoords0 = GLArrayDataServer.createGLSL(st, "gca_TexCoords", 2, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
+        texCoords0 = GLArrayDataServer.createGLSL("gca_TexCoords", 2, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
         texCoords0.putf(0f); texCoords0.putf(1f);
         texCoords0.putf(1f);  texCoords0.putf(1f);
         texCoords0.putf(0f);  texCoords0.putf(0f);        
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java
index 6d551144e..72977fb57 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java
@@ -48,10 +48,14 @@ import javax.media.opengl.GLUniformData;
 public class GearsES2 implements GLEventListener {
     private final FloatBuffer lightPos = Buffers.newDirectFloatBuffer( new float[] { 5.0f, 5.0f, 10.0f } );
     
+    private ShaderState st = null;
+    private PMVMatrix pmvMatrix = null;
+    private GLUniformData pmvMatrixUniform = null;
+    private GLUniformData colorU = null;
     private float view_rotx = 20.0f, view_roty = 30.0f, view_rotz = 0.0f;
-    private GearsObject gear1=null, gear2=null, gear3=null;
+    private GearsObjectES2 gear1=null, gear2=null, gear3=null;
     private float angle = 0.0f;
-    private int swapInterval;
+    private int swapInterval = 0;
 
     private int prevMouseX, prevMouseY;
 
@@ -63,10 +67,27 @@ public class GearsES2 implements GLEventListener {
         this.swapInterval = 1;
     }
 
-    ShaderState st;
-    PMVMatrix pmvMatrix;
-    GLUniformData pmvMatrixUniform;
-    GLUniformData colorU;
+    public void setGears(GearsObjectES2 g1, GearsObjectES2 g2, GearsObjectES2 g3) {
+        gear1 = g1;
+        gear2 = g2;
+        gear3 = g3;
+    }
+
+    /**
+     * @return gear1
+     */
+    public GearsObjectES2 getGear1() { return gear1; }
+
+    /**
+     * @return gear2
+     */
+    public GearsObjectES2 getGear2() { return gear2; }
+
+    /**
+     * @return gear3
+     */
+    public GearsObjectES2 getGear3() { return gear3; }
+
 
     public void init(GLAutoDrawable drawable) {
         System.err.println("Gears: Init: "+drawable);
@@ -96,6 +117,7 @@ public class GearsES2 implements GLEventListener {
         // drawable.setGL(new DebugGL(drawable.getGL()));
 
         pmvMatrix = new PMVMatrix();
+        st.attachObject("pmvMatrix", pmvMatrix);
         pmvMatrixUniform = new GLUniformData("pmvMatrix", 4, 4, pmvMatrix.glGetPMvMvitMatrixf()); // P, Mv, Mvi and Mvit
         st.ownUniform(pmvMatrixUniform);
         st.uniform(gl, pmvMatrixUniform);
@@ -107,10 +129,31 @@ public class GearsES2 implements GLEventListener {
         colorU = new GLUniformData("color", 4, GearsObject.red);
         st.ownUniform(colorU);
         st.uniform(gl, colorU);
-        gear1 = new GearsObjectES2(1.0f, 4.0f, 1.0f, 20, 0.7f, pmvMatrix, pmvMatrixUniform, colorU);         
-        gear2 = new GearsObjectES2(0.5f, 2.0f, 2.0f, 10, 0.7f, pmvMatrix, pmvMatrixUniform, colorU);
-        gear3 = new GearsObjectES2(1.3f, 2.0f, 0.5f, 10, 0.7f, pmvMatrix, pmvMatrixUniform, colorU);
 
+        if(null == gear1) {
+            gear1 = new GearsObjectES2(1.0f, 4.0f, 1.0f, 20, 0.7f, pmvMatrix, pmvMatrixUniform, colorU);
+            System.err.println("gear1 created: "+gear1);
+        } else {
+            gear1 = new GearsObjectES2(gear1, pmvMatrix, pmvMatrixUniform, colorU);
+            System.err.println("gear1 reused: "+gear1);
+        }
+                    
+        if(null == gear2) {
+            gear2 = new GearsObjectES2(0.5f, 2.0f, 2.0f, 10, 0.7f, pmvMatrix, pmvMatrixUniform, colorU);
+            System.err.println("gear2 created: "+gear2);
+        } else {
+            gear2 = new GearsObjectES2(gear2, pmvMatrix, pmvMatrixUniform, colorU);
+            System.err.println("gear2 reused: "+gear2);
+        }
+                
+        if(null == gear3) {
+            gear3 = new GearsObjectES2(1.3f, 2.0f, 0.5f, 10, 0.7f, pmvMatrix, pmvMatrixUniform, colorU);
+            System.err.println("gear3 created: "+gear3);
+        } else {
+            gear3 = new GearsObjectES2(gear3, pmvMatrix, pmvMatrixUniform, colorU);
+            System.err.println("gear3 reused: "+gear3);
+        }                
+        
         // MouseListener gearsMouse = new TraceMouseAdapter(new GearsMouseAdapter());
         MouseListener gearsMouse = new GearsMouseAdapter();    
         KeyListener gearsKeys = new GearsKeyAdapter();
@@ -119,15 +162,15 @@ public class GearsES2 implements GLEventListener {
             Window window = (Window) drawable;
             window.addMouseListener(gearsMouse);
             window.addKeyListener(gearsKeys);
-        } /* else if (GLProfile.isAWTAvailable() && drawable instanceof java.awt.Component) {
+        } else if (GLProfile.isAWTAvailable() && drawable instanceof java.awt.Component) {
             java.awt.Component comp = (java.awt.Component) drawable;
-            new AWTMouseAdapter(gearsMouse).addTo(comp);
-            new AWTKeyAdapter(gearsKeys).addTo(comp);
-        } */
+            new com.jogamp.newt.event.awt.AWTMouseAdapter(gearsMouse).addTo(comp);
+            new com.jogamp.newt.event.awt.AWTKeyAdapter(gearsKeys).addTo(comp);
+        }
     }
 
     public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
-        System.err.println("Gears: Reshape "+x+"/"+y+" "+width+"x"+height);
+        System.err.println("Gears: Reshape "+x+"/"+y+" "+width+"x"+height+", swapInterval "+swapInterval);
         GL2ES2 gl = drawable.getGL().getGL2ES2();
 
         gl.setSwapInterval(swapInterval);
@@ -140,11 +183,14 @@ public class GearsES2 implements GLEventListener {
         pmvMatrix.glMatrixMode(PMVMatrix.GL_MODELVIEW);
         pmvMatrix.glLoadIdentity();
         pmvMatrix.glTranslatef(0.0f, 0.0f, -40.0f);
-        st.uniform(gl, pmvMatrixUniform);        
+        st.uniform(gl, pmvMatrixUniform);
     }
 
     public void dispose(GLAutoDrawable drawable) {
         System.err.println("Gears: Dispose");
+        // GL2ES2 gl = drawable.getGL().getGL2ES2();
+        // st.useProgram(gl, false);
+        // st.destroy(gl);
     }
 
     public void display(GLAutoDrawable drawable) {
@@ -156,7 +202,16 @@ public class GearsES2 implements GLEventListener {
 
         gl.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 
-        gl.glClear(GL2ES2.GL_COLOR_BUFFER_BIT | GL2ES2.GL_DEPTH_BUFFER_BIT);
+        // Special handling for the case where the GLJPanel is translucent
+        // and wants to be composited with other Java 2D content
+        if (GLProfile.isAWTAvailable() && 
+            (drawable instanceof javax.media.opengl.awt.GLJPanel) &&
+            !((javax.media.opengl.awt.GLJPanel) drawable).isOpaque() &&
+            ((javax.media.opengl.awt.GLJPanel) drawable).shouldPreserveColorBufferIfTranslucent()) {
+          gl.glClear(GL.GL_DEPTH_BUFFER_BIT);
+        } else {
+          gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+        }
 
         pmvMatrix.glPushMatrix();
         pmvMatrix.glRotatef(view_rotx, 1.0f, 0.0f, 0.0f);
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsObjectES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsObjectES2.java
index 9e9fd1379..1ce0dd5dc 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsObjectES2.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsObjectES2.java
@@ -37,10 +37,9 @@ import com.jogamp.opengl.util.glsl.ShaderState;
  * author: Brian Paul (converted to Java by Sven Gothel) <P>
  */
 public class GearsObjectES2 extends GearsObject {
-    final ShaderState st;
-    final PMVMatrix pmvMatrix;
-    final GLUniformData pmvMatrixUniform;
-    final GLUniformData colorUniform;
+    PMVMatrix pmvMatrix;
+    GLUniformData pmvMatrixUniform;
+    GLUniformData colorUniform;
     
     public GearsObjectES2(float inner_radius, float outer_radius, float width,
                           int teeth, float tooth_depth,
@@ -49,18 +48,32 @@ public class GearsObjectES2 extends GearsObject {
                           GLUniformData colorUniform) 
     {
         super(inner_radius, outer_radius, width, teeth, tooth_depth);
-        this.st = ShaderState.getCurrentShaderState();
         this.pmvMatrix = pmvMatrix;
         this.pmvMatrixUniform = pmvMatrixUniform;
         this.colorUniform = colorUniform;
     }
 
+    public GearsObjectES2(GearsObject shared,
+                          PMVMatrix pmvMatrix, 
+                          GLUniformData pmvMatrixUniform,
+                          GLUniformData colorUniform) 
+    {
+        super(shared);
+        this.pmvMatrix = pmvMatrix;
+        this.pmvMatrixUniform = pmvMatrixUniform;
+        this.colorUniform = colorUniform;
+    }
+
+    @Override
+    public GLArrayDataServer createInterleaved(int comps, int dataType, boolean normalized, int initialSize, int vboUsage) {
+        return GLArrayDataServer.createGLSLInterleaved(comps, dataType, normalized, initialSize, vboUsage);
+    }
+    
     @Override
     public void addInterleavedVertexAndNormalArrays(GLArrayDataServer array,
             int components) {
-        final ShaderState st = ShaderState.getCurrentShaderState();
-        array.addGLSLSubArray(st, "vertices", 3, GL.GL_ARRAY_BUFFER);
-        array.addGLSLSubArray(st, "normals", 3, GL.GL_ARRAY_BUFFER);
+        array.addGLSLSubArray("vertices", 3, GL.GL_ARRAY_BUFFER);
+        array.addGLSLSubArray("normals", 3, GL.GL_ARRAY_BUFFER);
     }
 
     private void draw(GL2ES2 gl, GLArrayDataServer array, int mode) {
@@ -71,7 +84,8 @@ public class GearsObjectES2 extends GearsObject {
 
     @Override
     public void draw(GL _gl, float x, float y, float angle, FloatBuffer color) {
-        GL2ES2 gl = _gl.getGL2ES2();
+        final GL2ES2 gl = _gl.getGL2ES2();
+        final ShaderState st = ShaderState.getShaderState(gl);
         pmvMatrix.glPushMatrix();
         pmvMatrix.glTranslatef(x, y, 0f);
         pmvMatrix.glRotatef(angle, 0f, 0f, 1f);
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/Gears.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/Gears.java
index 2ead440fd..b4881ab51 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/Gears.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/Gears.java
@@ -5,9 +5,9 @@ import javax.media.opengl.GL2;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.GLProfile;
-import com.jogamp.opengl.util.Animator;
 
 import com.jogamp.newt.Window;
+import com.jogamp.newt.event.InputEvent;
 import com.jogamp.newt.event.KeyAdapter;
 import com.jogamp.newt.event.KeyEvent;
 import com.jogamp.newt.event.KeyListener;
@@ -30,7 +30,7 @@ public class Gears implements GLEventListener {
   private float angle = 0.0f;
   private int swapInterval;
 
-  private boolean mouseRButtonDown = false;
+  // private boolean mouseRButtonDown = false;
   private int prevMouseX, prevMouseY;
 
   public Gears(int swapInterval) {
@@ -347,14 +347,14 @@ public class Gears implements GLEventListener {
       public void mousePressed(MouseEvent e) {
         prevMouseX = e.getX();
         prevMouseY = e.getY();
-        if ((e.getModifiers() & e.BUTTON3_MASK) != 0) {
-          mouseRButtonDown = true;
+        if ((e.getModifiers() & InputEvent.BUTTON3_MASK) != 0) {
+          // mouseRButtonDown = true;
         }
       }
         
       public void mouseReleased(MouseEvent e) {
-        if ((e.getModifiers() & e.BUTTON3_MASK) != 0) {
-          mouseRButtonDown = false;
+        if ((e.getModifiers() & InputEvent.BUTTON3_MASK) != 0) {
+          // mouseRButtonDown = false;
         }
       }
         
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/GLSLMiscHelper.java b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/GLSLMiscHelper.java
index 7b30dedcc..c83af4362 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/GLSLMiscHelper.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/GLSLMiscHelper.java
@@ -112,7 +112,7 @@ public class GLSLMiscHelper {
     
     public static GLArrayDataServer createRSVertices0(GL2ES2 gl, ShaderState st, int location) {        
         // Allocate Vertex Array0
-        GLArrayDataServer vertices0 = GLArrayDataServer.createGLSL(st, "mgl_Vertex", 3, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
+        GLArrayDataServer vertices0 = GLArrayDataServer.createGLSL("mgl_Vertex", 3, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
         if(0<=location) {
             st.bindAttribLocation(gl, location, vertices0);
         }
@@ -135,7 +135,7 @@ public class GLSLMiscHelper {
     }
         
     public static GLArrayDataServer createRSVertices1(GL2ES2 gl, ShaderState st) {        
-        GLArrayDataServer vertices1 = GLArrayDataServer.createGLSL(st, "mgl_Vertex", 3, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW); 
+        GLArrayDataServer vertices1 = GLArrayDataServer.createGLSL("mgl_Vertex", 3, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW); 
         Assert.assertTrue(vertices1.isVBO());
         Assert.assertTrue(vertices1.isVertexAttribute());
         Assert.assertTrue(!vertices1.isVBOWritten());
@@ -155,7 +155,7 @@ public class GLSLMiscHelper {
     }
         
     public static GLArrayDataServer createRSColors0(GL2ES2 gl, ShaderState st, int location) {        
-        GLArrayDataServer colors0 = GLArrayDataServer.createGLSL(st, "mgl_Color", 4, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
+        GLArrayDataServer colors0 = GLArrayDataServer.createGLSL("mgl_Color", 4, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
         if(0<=location) {
             st.bindAttribLocation(gl, location, colors0);
         }        
@@ -176,7 +176,7 @@ public class GLSLMiscHelper {
     
     public static GLArrayDataServer createRSColors1(GL2ES2 gl, ShaderState st) {        
         // Allocate Color Array1
-        GLArrayDataServer colors1 = GLArrayDataServer.createGLSL(st, "mgl_Color", 4, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
+        GLArrayDataServer colors1 = GLArrayDataServer.createGLSL("mgl_Color", 4, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
         colors1.putf(1); colors1.putf(0); colors1.putf(1); colors1.putf(1);
         colors1.putf(0); colors1.putf(1); colors1.putf(0); colors1.putf(1);
         colors1.putf(1); colors1.putf(0); colors1.putf(1); colors1.putf(1);
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestFBOMRTNEWT01.java b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestFBOMRTNEWT01.java
index 2785a2701..05d9e0908 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestFBOMRTNEWT01.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestFBOMRTNEWT01.java
@@ -102,7 +102,7 @@ public class TestFBOMRTNEWT01 extends UITestCase {
         st.uniform(gl, pmvMatrixUniform);
         Assert.assertEquals(GL.GL_NO_ERROR, gl.glGetError());
         
-        final GLArrayDataServer vertices0 = GLArrayDataServer.createGLSL(st, "gca_Vertices", 3, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
+        final GLArrayDataServer vertices0 = GLArrayDataServer.createGLSL("gca_Vertices", 3, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
         // st.bindAttribLocation(gl, 0, vertices0);
         vertices0.putf(0); vertices0.putf(1);  vertices0.putf(0);
         vertices0.putf(1);  vertices0.putf(1);  vertices0.putf(0);
@@ -113,7 +113,7 @@ public class TestFBOMRTNEWT01 extends UITestCase {
         vertices0.enableBuffer(gl, false);
         Assert.assertEquals(GL.GL_NO_ERROR, gl.glGetError());
         
-        final GLArrayDataServer colors0 = GLArrayDataServer.createGLSL(st, "gca_Colors", 4, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
+        final GLArrayDataServer colors0 = GLArrayDataServer.createGLSL("gca_Colors", 4, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
         // st.bindAttribLocation(gl, 1, colors0);
         colors0.putf(1); colors0.putf(0);  colors0.putf(1); colors0.putf(1);
         colors0.putf(0);  colors0.putf(0);  colors0.putf(1); colors0.putf(1);
@@ -131,7 +131,7 @@ public class TestFBOMRTNEWT01 extends UITestCase {
         st.ownUniform(texUnit1);       
         st.uniform(gl, texUnit1);
                 
-        final GLArrayDataServer texCoords0 = GLArrayDataServer.createGLSL(st, "gca_TexCoords", 2, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
+        final GLArrayDataServer texCoords0 = GLArrayDataServer.createGLSL("gca_TexCoords", 2, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
         // st.bindAttribLocation(gl, 2, texCoords0);
         texCoords0.putf(0f); texCoords0.putf(1f);
         texCoords0.putf(1f);  texCoords0.putf(1f);
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestRulerNEWT01.java b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestRulerNEWT01.java
index 1ea9c731a..465f55c42 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestRulerNEWT01.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestRulerNEWT01.java
@@ -113,7 +113,7 @@ public class TestRulerNEWT01 extends UITestCase {
         System.err.println("Screen siz "+spix);
         System.err.println("Screen pixel/cm "+rulerPixFreqV.get(0)+", "+rulerPixFreqV.get(1));
 
-        final GLArrayDataServer vertices0 = GLArrayDataServer.createGLSL(st, "gca_Vertices", 3, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
+        final GLArrayDataServer vertices0 = GLArrayDataServer.createGLSL("gca_Vertices", 3, GL.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
         vertices0.putf(0); vertices0.putf(1);  vertices0.putf(0);
         vertices0.putf(1);  vertices0.putf(1);  vertices0.putf(0);
         vertices0.putf(0); vertices0.putf(0); vertices0.putf(0);