Bug 599 - FBObject / Offscreen Support - Part 1

- New FBObject implementation handling FBO and it's attachments  *** API CHANGE: Util -> Core ***
  while it's size and sample-count can be reconfigured on the fly.
    - com.jogamp.opengl.util.FBObject -> com.jogamp.opengl.FBObject
    - agnostic to texture unit
    - separate attachments using OO hierarchy reflecting FBO
    - handling MSAA and blitting
    - no FBO destruction for reconfig (attach/detach)

- New GLFBODrawableImpl impl. an FBObject based GLDrawable
   - Instantiated by a dummy native surface (onscreen and invisible)
     hooked up to a dummy GLDrawable, which is the delegation for context creation.

   - Utilizies ProxySurface.UpstreamSurfaceHook for dummy surface
     avoiding specialization for native platforms.

   - TODO: Allow to utilize common surface interface as a
     dummy-surface to supporting API seperation of
     windowing/GL. The latter allows impl. of createGLDrawable(NativeSurface)
     with FBO.

- New OffscreenAutoDrawable (extends GLAutoDrawableDelegate)
  for all offscreen drawables. Shall replace GLPbuffer.

- New GLCapabilities*.isFBO() / setFBO(boolean) to request FBO offscreen,
  similar to isPBuffer(). Rule: if both are requested, FBO shall be favored.

- GLContext adds raw FBO availability query (min. FBO avail),
  FBObject contains fine grained queries (TODO: Move parts to GLContext for efficiency).

- Add framebuffer tracking, allowing fast querying:
  - GLBase/GLContext:
      public int getBoundFramebuffer(int target);
      public int getDefaultDrawFramebuffer();
      public int getDefaultReadFramebuffer();

  - GLContextImpl
      public final void setBoundFramebuffer(int target, int framebufferName)
      .. called by GL impl bind framebuffer

- GL: getDefaultDrawFramebuffer(), getDefaultReadFramebuffer()
  Adding default framebuffer queries being issued by
  GL.glBindFramebuffer(target, 0) w/ a default framebuffer, o.e. zero.
  This allows a transparent use of a custom FBO even in case the applications
  attempts to reset FBO to zero.
    Value flow: GL <- GLContext <- GLDrawable,

- GLCapabilities handle fbo/pbuffer seperate, don't disable the other

- GLContext/GL track read/write framebuffer to be queried by FBObject
  to determine whether to bind/unbind  a framebuffer

- Test cases for multiple FBO w/ and w/o MSAA

Other Features:

- New interface ProxySurface.UpstreamSurfaceHook,
  allowing to hook an upstream surface of unknown type
  providing lifecycle and information (size, ..) callbacks.
  Used for all new dummy NativeSurface impl and SWT GLCanvas.

  - GLContext -> GLDrawable propagation context/drawable lifecycle
    via ProxySurface.UpstreamSurfaceHook allowing dynamic resources
    to react (create, init, ..)
    - contextRealized()
    - contextMadeCurrent()

- SurfaceChangeable -> MutableSurface
  currently only contains setting the surface handle.

  TODO: May need to move ProxySurface.UpstreamSurfaceHook -> MutableSurface.UpstreamSurfaceHook,
        allowing other impl. classes (NEWT OffscreenWindow) to utilize the new
        upstream hookup mechanism - will allow FBO/Dummy window to work.

- SWT GLCanvas using ProxySurface.UpstreamSurfaceHook for proper size
  propagation.

- New GLAutoDrawable::getUpstreamWidget(), allowing GLEventListener
  to fetch the owning Java side UI element (NEWT, SWT, AWT, ..).

- GLDrawableFactory: Removed createOffscreenSurface() - unused and not GL related

- EGLDrawableFactory handles device/profile avail. mapping
  while actually creating context/drawable.
  This allows us to learn whether the ES context is software/hardware as well as FBO avail.

- EGLDrawable: Removed secret buckets of EGL configs :)
  Employ native surface (X11, WGL, ..) to EGL 'mapping' in
  EGLDrawableFactory utilizing new EGLUpstreamSurfaceHook (implements ProxySurface.UpstreamSurfaceHook).

Other Bugs:

- Add CTX_OPTION_DEBUG to ctx/extension cache key since only a debug ctx
  may expose the ARB debug capability.
  This bug caused lack of ARB/AMD debug functionality.

- Fix GLProfile deadlock (debug mode, w/ EGL/ES, no X11),
  dump availability information _after_ lock.

- ImmModeSink draw(): Use GL's glDrawElements(..), don't cast for GL2ES1.
  Fixes use for GL2ES2.

- Fix KeyEvent.getKeyChar() comment (-> only stable for keyTyped(..))

Misc:

- Refined alot of API doc

- New GLExtensions holds commonly used GL extension strings,
  allows better referencing and usage lookup.

- Move GL (interface) decl. to GLBase

- GLBuffers: Cleanup API doc (format, types)

- TextureIO: Add PAM and PPM static suffix identifier

- GLCapabilities getNumSamples() returns 0 if sampleBuffers is disabled, this seems to be more natural.

- finalized a lot

41 files changed, 1488 insertions, 259 deletions

diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT00.java b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT00.java
index a09cc76ac..b22be0a93 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT00.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT00.java
@@ -194,7 +194,7 @@ public class TestTextRendererNEWT00 extends UITestCase {
             pw.printf("%s-%03dx%03d-T%04d", objName, drawable.getWidth(), drawable.getHeight(), texSize[0]);
             
             final String filename = dir + sw +".png";
-            if(screenshot.readPixels(drawable.getGL(), drawable, false)) {
+            if(screenshot.readPixels(drawable.getGL(), false)) {
                 screenshot.write(new File(filename));
             }
         }
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java
index a3182a30f..6378c1ee3 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java
@@ -194,7 +194,7 @@ public abstract class GPURendererListenerBase01 implements GLEventListener {
         pw.printf("-%03dx%03d-Z%04d-T%04d-%s", drawable.getWidth(), drawable.getHeight(), (int)Math.abs(zoom), texSize[0], objName);
         
         final String filename = dir + tech + sw +".png";
-        if(screenshot.readPixels(drawable.getGL(), drawable, false)) {
+        if(screenshot.readPixels(drawable.getGL(), false)) {
             screenshot.write(new File(filename));
         }
     }
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIListenerBase01.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIListenerBase01.java
index d0093ad0c..15daf70cd 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIListenerBase01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIListenerBase01.java
@@ -180,7 +180,7 @@ public abstract class UIListenerBase01 implements GLEventListener {
         pw.printf("-%03dx%03d-Z%04d-T%04d-%s", drawable.getWidth(), drawable.getHeight(), (int)Math.abs(zoom), 0, objName);
         
         final String filename = dir + tech + sw +".png";
-        if(screenshot.readPixels(drawable.getGL(), drawable, false)) {
+        if(screenshot.readPixels(drawable.getGL(), false)) {
             screenshot.write(new File(filename));
         }
     }
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBODrawableNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBODrawableNEWT.java
new file mode 100644
index 000000000..1a33845b3
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBODrawableNEWT.java
@@ -0,0 +1,272 @@
+/**
+ * Copyright 2012 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 java.io.IOException;
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GLAutoDrawable;
+import javax.media.opengl.GLCapabilities;
+import javax.media.opengl.GLContext;
+import javax.media.opengl.GLDrawable;
+import javax.media.opengl.GLDrawableFactory;
+import javax.media.opengl.GLEventListener;
+import javax.media.opengl.GLProfile;
+
+import jogamp.opengl.GLFBODrawableImpl;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.jogamp.opengl.FBObject;
+import com.jogamp.opengl.OffscreenAutoDrawable;
+import com.jogamp.opengl.test.junit.jogl.demos.es2.FBOMix2DemosES2;
+import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
+import com.jogamp.opengl.test.junit.jogl.demos.es2.MultisampleDemoES2;
+import com.jogamp.opengl.test.junit.util.UITestCase;
+import com.jogamp.opengl.util.GLReadBufferUtil;
+import com.jogamp.opengl.util.texture.TextureIO;
+
+public class TestFBODrawableNEWT extends UITestCase {
+    
+    static final int widthStep = 800/4;
+    static final int heightStep = 600/4;
+    volatile int szStep = 2;
+    
+    @Test
+    public void testGL2ES2_Demo1Normal() throws InterruptedException {    
+        final GLProfile glp = GLProfile.getGL2ES2();
+        final GLCapabilities caps = new GLCapabilities(glp);
+        testGLFBODrawableImpl(caps, new GearsES2(0));
+    }
+    
+    @Test
+    public void testGL2ES2_Demo1MSAA4() throws InterruptedException {    
+        final GLProfile glp = GLProfile.getGL2ES2();
+        final GLCapabilities caps = new GLCapabilities(glp);
+        caps.setSampleBuffers(true);
+        caps.setNumSamples(4);
+        testGLFBODrawableImpl(caps, new GearsES2(0));
+    }
+    
+    @Test
+    public void testGL2ES2_Demo2Normal() throws InterruptedException {    
+        final GLProfile glp = GLProfile.getGL2ES2();
+        final GLCapabilities caps = new GLCapabilities(glp);
+        testGLFBODrawableImpl(caps, new MultisampleDemoES2(false));
+    }
+    
+    @Test
+    public void testGL2ES2_Demo2MSAA4() throws InterruptedException {    
+        final GLProfile glp = GLProfile.getGL2ES2();
+        final GLCapabilities caps = new GLCapabilities(glp);
+        caps.setSampleBuffers(true);
+        caps.setNumSamples(4);
+        testGLFBODrawableImpl(caps, new MultisampleDemoES2(true));
+    }
+    
+    @Test
+    public void testGL2ES2_FBODemoNormal() throws InterruptedException {    
+        final GLProfile glp = GLProfile.getGL2ES2();
+        final FBOMix2DemosES2 demo = new FBOMix2DemosES2(0);
+        demo.setDoRotation(false);
+        final GLCapabilities caps = new GLCapabilities(glp);
+        testGLFBODrawableImpl(caps, demo);
+    }
+    
+    @Test
+    public void testGL2ES2_FBODemoMSAA4() throws InterruptedException {    
+        final GLProfile glp = GLProfile.getGL2ES2();
+        final FBOMix2DemosES2 demo = new FBOMix2DemosES2(0);
+        demo.setDoRotation(false);
+        final GLCapabilities caps = new GLCapabilities(glp);
+        caps.setSampleBuffers(true);
+        caps.setNumSamples(4);
+        testGLFBODrawableImpl(caps, demo);
+    }
+    
+    @Test
+    public void testEGLES2_Demo0Normal() throws InterruptedException {    
+        if( GLProfile.isAvailable(GLProfile.GLES2) )  {
+            final GLProfile glp = GLProfile.get(GLProfile.GLES2);
+            final GLCapabilities caps = new GLCapabilities(glp);
+            testGLFBODrawableImpl(caps, new GearsES2(0));
+        } else {
+            System.err.println("EGL ES2 n/a");
+        }
+    }
+    
+    @Test
+    public void testEGLES2_Demo0MSAA4() throws InterruptedException {    
+        if( GLProfile.isAvailable(GLProfile.GLES2) )  {
+            final GLProfile glp = GLProfile.get(GLProfile.GLES2);
+            final GLCapabilities caps = new GLCapabilities(glp);
+            caps.setSampleBuffers(true);
+            caps.setNumSamples(4);
+            testGLFBODrawableImpl(caps, new GearsES2(0));
+        } else {
+            System.err.println("EGL ES2 n/a");
+        }
+    }
+
+    boolean skipShot = false;
+    
+    void testGLFBODrawableImpl(GLCapabilities caps, GLEventListener demo) throws InterruptedException {
+        final GLReadBufferUtil screenshot = new GLReadBufferUtil(false, false);
+        caps.setFBO(true);
+        final GLDrawableFactory factory = GLDrawableFactory.getFactory(caps.getGLProfile());
+        final GLDrawable fboDrawable = factory.createOffscreenDrawable(null, caps, null, widthStep*szStep, heightStep*szStep);
+        Assert.assertNotNull(fboDrawable);
+        Assert.assertTrue("Not an FBO Drawable", fboDrawable instanceof GLFBODrawableImpl);
+        
+        fboDrawable.setRealized(true);
+        Assert.assertTrue(fboDrawable.isRealized());
+        
+        final FBObject fbo = ((GLFBODrawableImpl)fboDrawable).getFBObject();
+        
+        System.out.println("Realized: "+fboDrawable);
+        System.out.println("Realized: "+fboDrawable.getChosenGLCapabilities());
+        System.out.println("Realized: "+fbo);
+        
+        final GLContext context = fboDrawable.createContext(null);
+        Assert.assertNotNull(context);
+        
+        int res = context.makeCurrent();
+        Assert.assertTrue(GLContext.CONTEXT_CURRENT_NEW==res || GLContext.CONTEXT_CURRENT==res);
+        context.release();
+        
+        System.out.println("Post Create-Ctx: "+fbo);        
+        final FBObject.Colorbuffer colorA = fbo.getColorbuffer(0);
+        Assert.assertNotNull(colorA);
+        final FBObject.RenderAttachment depthA = fbo.getDepthAttachment();
+        Assert.assertNotNull(depthA);
+        
+        final OffscreenAutoDrawable glad = new OffscreenAutoDrawable(fboDrawable, context, null);
+
+        glad.addGLEventListener(demo);
+        glad.addGLEventListener(new GLEventListener() {
+            volatile int displayCount=0;
+            volatile int reshapeCount=0;
+            public void init(GLAutoDrawable drawable) {}
+            public void dispose(GLAutoDrawable drawable) {}
+            public void display(GLAutoDrawable drawable) {
+                final GL gl = drawable.getGL();
+                // System.err.println(Thread.currentThread().getName()+": ** display: "+displayCount+": step "+szStep+" "+drawable.getWidth()+"x"+drawable.getHeight());
+                // System.err.println(Thread.currentThread().getName()+": ** FBO-THIS: "+fbo);
+                // System.err.println(Thread.currentThread().getName()+": ** FBO-SINK: "+fbo.getSamplingSinkFBO());
+                // System.err.println(Thread.currentThread().getName()+": ** drawable-read: "+gl.getDefaultReadFramebuffer());
+                if(skipShot) {
+                    skipShot=false;
+                } else {
+                    snapshot(getSimpleTestName("."), displayCount, "msaa"+fbo.getNumSamples(), gl, screenshot, TextureIO.PNG, null);
+                }
+                Assert.assertEquals(drawable.getWidth(), widthStep*szStep);
+                Assert.assertEquals(drawable.getHeight(), heightStep*szStep); 
+                displayCount++;
+            }
+            public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
+                System.err.println(Thread.currentThread().getName()+": ** reshape: "+reshapeCount+": step "+szStep+" "+width+"x"+height+" - "+drawable.getWidth()+"x"+drawable.getHeight());
+                Assert.assertEquals(drawable.getWidth(), widthStep*szStep);
+                Assert.assertEquals(drawable.getHeight(), heightStep*szStep);                
+                reshapeCount++;
+            }
+        });
+
+        // 0 - szStep = 2
+        glad.display();
+        
+        // 1, 2 (resize + display)
+        szStep = 1;
+        skipShot=true;
+        glad.setSize(widthStep*szStep, heightStep*szStep);
+        glad.display();
+        Assert.assertEquals(glad.getWidth(), widthStep*szStep);
+        Assert.assertEquals(glad.getHeight(), heightStep*szStep);
+        {
+            // Check whether the attachment reference are still valid!
+            FBObject.Colorbuffer _colorA = fbo.getColorbuffer(0);
+            Assert.assertNotNull(_colorA);
+            Assert.assertTrue(colorA == _colorA);
+            Assert.assertTrue(colorA.equals(_colorA));
+            FBObject.RenderAttachment _depthA = fbo.getDepthAttachment();
+            Assert.assertNotNull(_depthA);
+            Assert.assertTrue(depthA == _depthA);
+            Assert.assertTrue(depthA.equals(_depthA));
+            
+            _colorA = fbo.getColorbuffer(colorA);
+            Assert.assertNotNull(_colorA);
+            Assert.assertTrue(colorA == _colorA);
+            Assert.assertTrue(colorA.equals(_colorA));
+        }
+        
+        // 3, 4 (resize + display)
+        szStep = 4;
+        skipShot=true;
+        glad.setSize(widthStep*szStep, heightStep*szStep);
+        glad.display();
+        Assert.assertEquals(glad.getWidth(), widthStep*szStep);
+        Assert.assertEquals(glad.getHeight(), heightStep*szStep);
+        {
+            // Check whether the attachment reference are still valid!
+            FBObject.Colorbuffer _colorA = fbo.getColorbuffer(0);
+            Assert.assertNotNull(_colorA);
+            Assert.assertTrue(colorA == _colorA);
+            final FBObject.RenderAttachment _depthA = fbo.getDepthAttachment();
+            Assert.assertNotNull(_depthA);
+            Assert.assertTrue(depthA == _depthA);
+            
+            _colorA = fbo.getColorbuffer(colorA);
+            Assert.assertNotNull(_colorA);
+            Assert.assertTrue(colorA == _colorA);
+        }
+        
+        // 5
+        glad.display();
+        Assert.assertEquals(glad.getWidth(), widthStep*szStep);
+        Assert.assertEquals(glad.getHeight(), heightStep*szStep);
+        
+        // 6, 7 (resize + display)
+        szStep = 3;
+        skipShot=true;
+        glad.setSize(widthStep*szStep, heightStep*szStep);
+        glad.display();
+        Assert.assertEquals(glad.getWidth(), widthStep*szStep);
+        Assert.assertEquals(glad.getHeight(), heightStep*szStep);
+        
+        glad.destroy();
+        System.out.println("Fin: "+fboDrawable);
+        
+        // final GLAutoDrawableDelegate glad = new GLAutoDrawableDelegate(fboDrawable, context);
+    }
+    
+    public static void main(String args[]) throws IOException {
+        org.junit.runner.JUnitCore.main(TestFBODrawableNEWT.class.getName());
+    }
+
+}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestFBOMRTNEWT01.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOMRTNEWT01.java
index 1b33866d7..f7c83a03b 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestFBOMRTNEWT01.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOMRTNEWT01.java
@@ -25,14 +25,18 @@
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
  */
-package com.jogamp.opengl.test.junit.jogl.glsl;
+package com.jogamp.opengl.test.junit.jogl.acore;
 
-import com.jogamp.opengl.util.FBObject;
+import com.jogamp.opengl.FBObject;
+import com.jogamp.opengl.FBObject.TextureAttachment;
 import com.jogamp.opengl.util.GLArrayDataServer;
+import com.jogamp.opengl.util.GLReadBufferUtil;
 import com.jogamp.opengl.util.PMVMatrix;
 import com.jogamp.opengl.util.glsl.ShaderCode;
 import com.jogamp.opengl.util.glsl.ShaderProgram;
 import com.jogamp.opengl.util.glsl.ShaderState;
+import com.jogamp.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.FBObject.Attachment.Type;
 import com.jogamp.opengl.test.junit.jogl.demos.es2.RedSquareES2;
 import com.jogamp.opengl.test.junit.util.MiscUtils;
 import com.jogamp.opengl.test.junit.util.NEWTGLContext;
@@ -40,6 +44,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase;
 
 import java.io.IOException;
 
+import javax.media.nativewindow.NativeSurface;
 import javax.media.opengl.GL;
 import javax.media.opengl.GL2ES2;
 import javax.media.opengl.GL2GL3;
@@ -53,17 +58,20 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class TestFBOMRTNEWT01 extends UITestCase {
-    static long durationPerTest = 10; // ms
+    static long durationPerTest = 10*40*2; // ms
 
     @Test
     public void test01() throws InterruptedException {
+        final int step = 4;
+        final int width = 800;
+        final int height = 600;
         // preset ..
         if(!GLProfile.isAvailable(GLProfile.GL2GL3)) {
             System.err.println("Test requires GL2/GL3 profile.");
             return;
         }
         final NEWTGLContext.WindowContext winctx = NEWTGLContext.createOnscreenWindow(
-                new GLCapabilities(GLProfile.getGL2GL3()), 640, 480, true);        
+                new GLCapabilities(GLProfile.getGL2GL3()), width/step, height/step, true);        
         final GLDrawable drawable = winctx.context.getGLDrawable();
         GL2GL3 gl = winctx.context.getGL().getGL2GL3();
         gl = gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Debug", null, gl, null) ).getGL2GL3();
@@ -147,12 +155,15 @@ public class TestFBOMRTNEWT01 extends UITestCase {
         texCoords0.enableBuffer(gl, false);
         Assert.assertEquals(GL.GL_NO_ERROR, gl.glGetError());
 
+        final int texA0Point = 0; // attachment point for texA0
+        final int texA1Point = 1; // attachment point for texA1
+        
         // FBO w/ 2 texture2D color buffers
-        final FBObject fbo_mrt = new FBObject(drawable.getWidth(), drawable.getHeight());
-        fbo_mrt.init(gl);
-        Assert.assertTrue( 0 == fbo_mrt.attachTexture2D(gl, texUnit0.intValue(), GL.GL_NEAREST, GL.GL_NEAREST, GL2ES2.GL_CLAMP_TO_EDGE, GL2ES2.GL_CLAMP_TO_EDGE) );
-        Assert.assertTrue( 1 == fbo_mrt.attachTexture2D(gl, texUnit1.intValue(), GL.GL_NEAREST, GL.GL_NEAREST, GL2ES2.GL_CLAMP_TO_EDGE, GL2ES2.GL_CLAMP_TO_EDGE) );
-        Assert.assertTrue( fbo_mrt.attachDepthBuffer(gl, GL.GL_DEPTH_COMPONENT16) );
+        final FBObject fbo_mrt = new FBObject();
+        fbo_mrt.reset(gl, drawable.getWidth(), drawable.getHeight());
+        final TextureAttachment texA0 = fbo_mrt.attachTexture2D(gl, texA0Point, true, GL.GL_NEAREST, GL.GL_NEAREST, GL.GL_CLAMP_TO_EDGE, GL.GL_CLAMP_TO_EDGE);
+        final TextureAttachment texA1 = fbo_mrt.attachTexture2D(gl, texA1Point, true, GL.GL_NEAREST, GL.GL_NEAREST, GL.GL_CLAMP_TO_EDGE, GL.GL_CLAMP_TO_EDGE);
+        fbo_mrt.attachRenderbuffer(gl, Type.DEPTH, 24);
         Assert.assertTrue( fbo_mrt.isStatusValid() ) ;
         fbo_mrt.unbind(gl);
         
@@ -170,9 +181,13 @@ public class TestFBOMRTNEWT01 extends UITestCase {
         st.uniform(gl, pmvMatrixUniform);
         Assert.assertEquals(GL.GL_NO_ERROR, gl.glGetError());
         
-        final int[] two_buffers = new int[] { GL.GL_COLOR_ATTACHMENT0, GL.GL_COLOR_ATTACHMENT0+1 };
+        final int[] two_buffers = new int[] { GL.GL_COLOR_ATTACHMENT0+texA0Point, GL.GL_COLOR_ATTACHMENT0+texA1Point };
         final int[] bck_buffers = new int[] { GL2GL3.GL_BACK_LEFT };
         
+        final GLReadBufferUtil screenshot = new GLReadBufferUtil(true, false);
+        int step_i = 0;
+        int[] last_snap_size = new int[] { 0, 0 };
+        
         for(int i=0; i<durationPerTest; i+=50) {
             // pass 1 - MRT: Red -> buffer0, Green -> buffer1
             st.attachShaderProgram(gl, sp0, true);           
@@ -198,8 +213,11 @@ public class TestFBOMRTNEWT01 extends UITestCase {
             gl.glDrawBuffers(1, bck_buffers, 0);
             
             gl.glViewport(0, 0, drawable.getWidth(), drawable.getHeight());
-            fbo_mrt.use(gl, 0);
-            fbo_mrt.use(gl, 1);
+            
+            gl.glActiveTexture(GL.GL_TEXTURE0 + texUnit0.intValue());            
+            fbo_mrt.use(gl, texA0);
+            gl.glActiveTexture(GL.GL_TEXTURE0 + texUnit1.intValue());
+            fbo_mrt.use(gl, texA1);
             gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
             gl.glDrawArrays(GL.GL_TRIANGLE_STRIP, 0, 4);
             fbo_mrt.unuse(gl);
@@ -207,8 +225,27 @@ public class TestFBOMRTNEWT01 extends UITestCase {
             colors0.enableBuffer(gl, false);
             texCoords0.enableBuffer(gl, false);
             
+            {
+                final NativeSurface ns = gl.getContext().getGLReadDrawable().getNativeSurface();
+                if(last_snap_size[0] != ns.getWidth() && last_snap_size[1] != ns.getHeight()) {
+                    gl.glFinish(); // sync .. no swap buffers yet!
+                    snapshot(getSimpleTestName("."), step_i, null, gl, screenshot, TextureIO.PNG, null); // overwrite ok
+                    last_snap_size[0] = ns.getWidth();
+                    last_snap_size[1] = ns.getHeight();
+                }
+            }
+            
             drawable.swapBuffers();
             Thread.sleep(50);
+            int j = (int) ( (long)i / (durationPerTest/(long)step) ) + 1;
+            if(j>step_i) {
+                int w = width/step * j;
+                int h = height/step * j;
+                System.err.println("resize: "+step_i+" -> "+j+" - "+w+"x"+h);
+                fbo_mrt.reset(gl, w, h);
+                winctx.window.setSize(w, h);
+                step_i = j;
+            }
         }
         
         NEWTGLContext.destroyWindow(winctx);
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOMix2DemosES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOMix2DemosES2NEWT.java
new file mode 100644
index 000000000..b384c9327
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOMix2DemosES2NEWT.java
@@ -0,0 +1,258 @@
+/**
+ * Copyright 2012 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 java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+import com.jogamp.newt.event.KeyAdapter;
+import com.jogamp.newt.event.KeyEvent;
+import com.jogamp.newt.event.WindowEvent;
+import com.jogamp.newt.event.WindowAdapter;
+import com.jogamp.newt.opengl.GLWindow;
+import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
+import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.UITestCase;
+import com.jogamp.opengl.test.junit.util.QuitAdapter;
+
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.GLReadBufferUtil;
+import com.jogamp.opengl.util.texture.TextureIO;
+
+import com.jogamp.opengl.test.junit.jogl.demos.es2.FBOMix2DemosES2;
+
+import javax.media.opengl.GLAutoDrawable;
+import javax.media.opengl.GLCapabilities;
+import javax.media.opengl.GLCapabilitiesImmutable;
+import javax.media.opengl.GLEventListener;
+import javax.media.opengl.GLProfile;
+
+import org.junit.Assert;
+import org.junit.AfterClass;
+import org.junit.Test;
+
+public class TestFBOMix2DemosES2NEWT extends UITestCase {    
+    static long duration = 500; // ms
+    static int swapInterval = 1;
+    static boolean showFPS = false;
+    static boolean forceES2 = false;
+    static boolean doRotate = true;
+    static boolean demo0Only = false;
+    static int globalNumSamples = 0;
+    static boolean mainRun = false;
+    
+    @AfterClass
+    public static void releaseClass() {
+    }
+
+    protected void runTestGL(GLCapabilitiesImmutable caps, int numSamples) throws InterruptedException {
+        final GLReadBufferUtil screenshot = new GLReadBufferUtil(true, false);
+        System.err.println("requested: vsync "+swapInterval+", "+caps);
+        final GLWindow glWindow = GLWindow.create(caps);
+        Assert.assertNotNull(glWindow);
+        glWindow.setTitle("Gears NEWT Test (translucent "+!caps.isBackgroundOpaque()+"), swapInterval "+swapInterval);
+        if(mainRun) {
+            glWindow.setSize(512, 512);            
+        } else {
+            glWindow.setSize(128, 128);
+        }
+
+        final FBOMix2DemosES2 demo = new FBOMix2DemosES2(swapInterval);
+        demo.setMSAA(numSamples);
+        demo.setDoRotation(doRotate);
+        demo.setDemo0Only(demo0Only);
+        glWindow.addGLEventListener(demo);
+        glWindow.addGLEventListener(new GLEventListener() {
+            int i=0, c=0;
+            int origS;
+            public void init(GLAutoDrawable drawable) {
+                origS = demo.getMSAA();
+            }
+            public void dispose(GLAutoDrawable drawable) {}
+            public void display(GLAutoDrawable drawable) {
+                if(mainRun) return;
+                
+                final int dw = drawable.getWidth();
+                final int dh = drawable.getHeight();
+                c++;
+                
+                if(dw<800) {
+                    System.err.println("XXX: "+dw+"x"+dh+", c "+c);
+                    if(0 == c%3) {
+                        snapshot(getSimpleTestName("."), i++, "msaa"+demo.getMSAA(), drawable.getGL(), screenshot, TextureIO.PNG, null);                        
+                    }
+                    if( 3 == c ) {
+                        new Thread() { 
+                            @Override
+                            public void run() {
+                                demo.setMSAA(4);
+                            } }.start();
+                    } else if( 6 == c ) {
+                        new Thread() { 
+                            @Override
+                            public void run() {
+                                demo.setMSAA(8);
+                            } }.start();
+                    } else if(9 == c) {
+                        c=0;
+                        new Thread() { 
+                            @Override
+                            public void run() {
+                                glWindow.setSize(dw+256, dh+256);
+                                demo.setMSAA(origS);
+                            } }.start();                            
+                    }
+                }
+            }
+            public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { }
+        });
+        
+        Animator animator = new Animator(glWindow);
+        QuitAdapter quitAdapter = new QuitAdapter();
+
+        //glWindow.addKeyListener(new TraceKeyAdapter(quitAdapter));
+        //glWindow.addWindowListener(new TraceWindowAdapter(quitAdapter));
+        glWindow.addKeyListener(quitAdapter);
+        glWindow.addWindowListener(quitAdapter);
+
+        glWindow.addWindowListener(new WindowAdapter() {
+            public void windowResized(WindowEvent e) {
+                System.err.println("window resized: "+glWindow.getX()+"/"+glWindow.getY()+" "+glWindow.getWidth()+"x"+glWindow.getHeight());
+            }
+            public void windowMoved(WindowEvent e) {
+                System.err.println("window moved:   "+glWindow.getX()+"/"+glWindow.getY()+" "+glWindow.getWidth()+"x"+glWindow.getHeight());
+            }            
+        });
+        
+        glWindow.addKeyListener(new KeyAdapter() {
+            public void keyTyped(KeyEvent e) {
+                System.err.println("*** "+e);
+                if(e.getKeyChar()=='f') {
+                    new Thread() {
+                        public void run() {
+                            System.err.println("[set fullscreen  pre]: "+glWindow.getX()+"/"+glWindow.getY()+" "+glWindow.getWidth()+"x"+glWindow.getHeight()+", f "+glWindow.isFullscreen()+", a "+glWindow.isAlwaysOnTop()+", "+glWindow.getInsets());
+                            glWindow.setFullscreen(!glWindow.isFullscreen());
+                            System.err.println("[set fullscreen post]: "+glWindow.getX()+"/"+glWindow.getY()+" "+glWindow.getWidth()+"x"+glWindow.getHeight()+", f "+glWindow.isFullscreen()+", a "+glWindow.isAlwaysOnTop()+", "+glWindow.getInsets());
+                    } }.start();
+                } else if(e.getKeyChar()=='d') {
+                    demo.setDemo0Only(!demo.getDemo0Only());
+                } else {
+                    int num = e.getKeyChar() - '0';
+                    System.err.println("*** "+num);
+                    if(0 <= num && num <= 8) {
+                        System.err.println("MSAA: "+demo.getMSAA()+" -> "+num);
+                        demo.setMSAA(num);                        
+                    }
+                }
+            }
+        });
+
+        animator.start();
+        // glWindow.setSkipContextReleaseThread(animator.getThread());
+
+        glWindow.setVisible(true);
+        
+        System.err.println("NW chosen: "+glWindow.getDelegatedWindow().getChosenCapabilities());
+        System.err.println("GL chosen: "+glWindow.getChosenCapabilities());
+        System.err.println("window pos/siz: "+glWindow.getX()+"/"+glWindow.getY()+" "+glWindow.getWidth()+"x"+glWindow.getHeight()+", "+glWindow.getInsets());
+        
+        animator.setUpdateFPSFrames(60, showFPS ? System.err : null);
+        
+        while(!quitAdapter.shouldQuit() && animator.isAnimating() && animator.getTotalFPSDuration()<duration) {
+            Thread.sleep(100);
+        }
+
+        animator.stop();
+        Assert.assertFalse(animator.isAnimating());
+        Assert.assertFalse(animator.isStarted());
+        glWindow.destroy();
+        Assert.assertEquals(true,  AWTRobotUtil.waitForRealized(glWindow, false));
+    }
+
+    @Test
+    public void test01_Main() throws InterruptedException {
+        if( mainRun ) {
+            GLCapabilities caps = new GLCapabilities(forceES2 ? GLProfile.get(GLProfile.GLES2) : GLProfile.getGL2ES2());
+            caps.setAlphaBits(1);
+            runTestGL(caps, globalNumSamples);            
+        }
+    }
+    
+    @Test
+    public void test01() throws InterruptedException {
+        if( mainRun ) return ;
+        GLCapabilities caps = new GLCapabilities(forceES2 ? GLProfile.get(GLProfile.GLES2) : GLProfile.getGL2ES2());
+        caps.setAlphaBits(1);
+        runTestGL(caps, 0);
+    }
+
+    public static void main(String args[]) throws IOException {        
+        boolean waitForKey = false;
+        
+        mainRun = true;
+        
+        for(int i=0; i<args.length; i++) {
+            if(args[i].equals("-time")) {
+                i++;
+                duration = MiscUtils.atol(args[i], duration);
+            } else if(args[i].equals("-vsync")) {
+                i++;
+                swapInterval = MiscUtils.atoi(args[i], swapInterval);
+            } else if(args[i].equals("-es2")) {
+                forceES2 = true;
+            } else if(args[i].equals("-showFPS")) {
+                showFPS = true;
+            } else if(args[i].equals("-samples")) {
+                i++;
+                globalNumSamples = MiscUtils.atoi(args[i], globalNumSamples);
+            } else if(args[i].equals("-norotate")) {
+                doRotate = false;
+            } else if(args[i].equals("-demo0Only")) {
+                demo0Only = true;
+            } else if(args[i].equals("-wait")) {
+                waitForKey = true;
+            } else if(args[i].equals("-nomain")) {
+                mainRun = false;
+            }
+        }
+        
+        System.err.println("swapInterval "+swapInterval);
+        System.err.println("forceES2 "+forceES2);
+
+        if(waitForKey) {
+            BufferedReader stdin = new BufferedReader(new InputStreamReader(System.in));
+            System.err.println("Press enter to continue");
+            try {
+                System.err.println(stdin.readLine());
+            } catch (IOException e) { }
+        }
+        org.junit.runner.JUnitCore.main(TestFBOMix2DemosES2NEWT.class.getName());
+    }
+}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateNEWT.java
index a2d060a8c..eb716677d 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateNEWT.java
@@ -85,7 +85,7 @@ public class TestGLAutoDrawableDelegateNEWT extends UITestCase {
         Assert.assertTrue(GLContext.CONTEXT_CURRENT_NEW==res || GLContext.CONTEXT_CURRENT==res);
         context.release();
         
-        final GLAutoDrawableDelegate glad = new GLAutoDrawableDelegate(drawable, context) {
+        final GLAutoDrawableDelegate glad = new GLAutoDrawableDelegate(drawable, context, window) {
             @Override
             public void destroy() {
                 super.destroy();  // destroys drawable/context
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextDrawableSwitchNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextDrawableSwitchNEWT.java
index 483a09735..06aa29b4f 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextDrawableSwitchNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextDrawableSwitchNEWT.java
@@ -88,7 +88,7 @@ public class TestGLContextDrawableSwitchNEWT extends UITestCase {
         drawable.setRealized(true);
         Assert.assertTrue(drawable.isRealized());
         
-        final GLAutoDrawableDelegate glad = new GLAutoDrawableDelegate(drawable, null) {
+        final GLAutoDrawableDelegate glad = new GLAutoDrawableDelegate(drawable, null, window) {
             @Override
             public void destroy() {
                 super.destroy();  // destroys drawable/context
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLProfile01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLProfile01NEWT.java
index 9ca6670ad..d9429129b 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLProfile01NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLProfile01NEWT.java
@@ -54,7 +54,7 @@ public class TestGLProfile01NEWT extends UITestCase {
         System.err.println(JoglVersion.getInstance());
         System.err.println(NewtVersion.getInstance());
 
-        System.err.println(JoglVersion.getDefaultOpenGLInfo(null, true).toString());        
+        System.err.println(JoglVersion.getDefaultOpenGLInfo(null, null, true).toString());        
     }
 
     @Test
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteNEWT.java
index 5f374830d..b21ad5b5b 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteNEWT.java
@@ -86,7 +86,7 @@ public class TestShutdownCompleteNEWT extends UITestCase {
         }
         long t2 = System.nanoTime();
         if(glInfo) {
-            System.err.println(JoglVersion.getDefaultOpenGLInfo(null, false).toString());
+            System.err.println(JoglVersion.getDefaultOpenGLInfo(null, null, false).toString());
         }
         long t3 = System.nanoTime();        
         GLProfile.shutdown(GLProfile.ShutdownType.COMPLETE);        
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES1AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES1AWT.java
index 4b0caf898..478bd4543 100755
--- a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES1AWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES1AWT.java
@@ -40,7 +40,6 @@
 
 package com.jogamp.opengl.test.junit.jogl.caps;
 
-import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.awt.BorderLayout;
 import java.awt.Frame;
@@ -48,14 +47,15 @@ import java.awt.Frame;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLCapabilitiesChooser;
-import javax.media.opengl.GLCapabilitiesImmutable;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.GLCanvas;
 
+import com.jogamp.opengl.test.junit.jogl.demos.es1.MultisampleDemoES1;
 import com.jogamp.opengl.test.junit.util.MiscUtils;
 import com.jogamp.opengl.test.junit.util.UITestCase;
 import com.jogamp.opengl.util.GLReadBufferUtil;
+import com.jogamp.opengl.util.texture.TextureIO;
 
 import org.junit.Test;
 
@@ -75,13 +75,6 @@ public class TestMultisampleES1AWT extends UITestCase {
      org.junit.runner.JUnitCore.main(tstname);
   }
 
-  protected void snapshot(GLAutoDrawable drawable, boolean alpha, boolean flip, String filename) {
-    GLReadBufferUtil screenshot = new GLReadBufferUtil(alpha, false);
-    if(screenshot.readPixels(drawable.getGL(), drawable, flip)) {
-        screenshot.write(new File(filename));
-    }                
-  }
-    
   @Test
   public void testOnscreenMultiSampleAA0() throws InterruptedException, InvocationTargetException {
     testMultiSampleAAImpl(0);
@@ -98,6 +91,7 @@ public class TestMultisampleES1AWT extends UITestCase {
   }
 
   private void testMultiSampleAAImpl(int reqSamples) throws InterruptedException, InvocationTargetException {
+    final GLReadBufferUtil screenshot = new GLReadBufferUtil(true, false);
     GLProfile glp = GLProfile.getMaxFixedFunc(true);
     GLCapabilities caps = new GLCapabilities(glp);
     GLCapabilitiesChooser chooser = new MultisampleChooser01();
@@ -110,14 +104,11 @@ public class TestMultisampleES1AWT extends UITestCase {
     canvas = new GLCanvas(caps, chooser, null, null);
     canvas.addGLEventListener(new MultisampleDemoES1(reqSamples>0?true:false));
     canvas.addGLEventListener(new GLEventListener() {
+        int displayCount = 0;
         public void init(GLAutoDrawable drawable) {}
         public void dispose(GLAutoDrawable drawable) {}
         public void display(GLAutoDrawable drawable) {
-            final GLCapabilitiesImmutable caps = drawable.getChosenGLCapabilities();
-            final String pfmt = caps.getAlphaBits() > 0 ? "rgba" : "rgb_";
-            final String aaext = caps.getSampleExtension();
-            final int samples = caps.getSampleBuffers() ? caps.getNumSamples() : 0 ;
-            snapshot(drawable, false, false, getSimpleTestName(".")+"-F_rgb_-I_"+pfmt+"-S"+samples+"-"+aaext+"-"+drawable.getGLProfile().getName()+".png");
+            snapshot(getSimpleTestName("."), displayCount++, null, drawable.getGL(), screenshot, TextureIO.PNG, null);
         }
         public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { }
     });
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES1NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES1NEWT.java
index 2e47b6841..ed8e2bd85 100755
--- a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES1NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES1NEWT.java
@@ -40,21 +40,20 @@
 
 package com.jogamp.opengl.test.junit.jogl.caps;
 
-import java.io.File;
-
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLCapabilitiesChooser;
-import javax.media.opengl.GLCapabilitiesImmutable;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.GLProfile;
 
 import org.junit.Test;
 
 import com.jogamp.newt.opengl.GLWindow;
+import com.jogamp.opengl.test.junit.jogl.demos.es1.MultisampleDemoES1;
 import com.jogamp.opengl.test.junit.util.MiscUtils;
 import com.jogamp.opengl.test.junit.util.UITestCase;
 import com.jogamp.opengl.util.GLReadBufferUtil;
+import com.jogamp.opengl.util.texture.TextureIO;
 
 public class TestMultisampleES1NEWT extends UITestCase {
   static long durationPerTest = 60; // ms
@@ -71,13 +70,6 @@ public class TestMultisampleES1NEWT extends UITestCase {
      org.junit.runner.JUnitCore.main(tstname);
   }
 
-  protected void snapshot(GLAutoDrawable drawable, boolean alpha, boolean flip, String filename) {
-    GLReadBufferUtil screenshot = new GLReadBufferUtil(alpha, false);
-    if(screenshot.readPixels(drawable.getGL(), drawable, flip)) {
-        screenshot.write(new File(filename));
-    }                
-  }
-    
   @Test
   public void testOnscreenMultiSampleAA0() throws InterruptedException {
     testMultiSampleAAImpl(true, 0);
@@ -119,6 +111,7 @@ public class TestMultisampleES1NEWT extends UITestCase {
   }
 
   private void testMultiSampleAAImpl(boolean onscreen, int reqSamples) throws InterruptedException {
+    final GLReadBufferUtil screenshot = new GLReadBufferUtil(true, false);
     GLProfile glp = GLProfile.getMaxFixedFunc(true);
     GLCapabilities caps = new GLCapabilities(glp);
     GLCapabilitiesChooser chooser = new MultisampleChooser01();
@@ -136,14 +129,11 @@ public class TestMultisampleES1NEWT extends UITestCase {
     window.setCapabilitiesChooser(chooser);
     window.addGLEventListener(new MultisampleDemoES1(reqSamples>0?true:false));
     window.addGLEventListener(new GLEventListener() {
+        int displayCount = 0;
         public void init(GLAutoDrawable drawable) {}
         public void dispose(GLAutoDrawable drawable) {}
         public void display(GLAutoDrawable drawable) {
-            final GLCapabilitiesImmutable caps = drawable.getChosenGLCapabilities();
-            final String pfmt = caps.getAlphaBits() > 0 ? "rgba" : "rgb_";
-            final String aaext = caps.getSampleExtension();
-            final int samples = caps.getSampleBuffers() ? caps.getNumSamples() : 0 ;
-            snapshot(drawable, false, false, getSimpleTestName(".")+"-F_rgb_-I_"+pfmt+"-S"+samples+"-"+aaext+"-"+drawable.getGLProfile().getName()+".png");
+            snapshot(getSimpleTestName("."), displayCount++, null, drawable.getGL(), screenshot, TextureIO.PNG, null);
         }
         public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { }
     });
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES2NEWT.java
new file mode 100644
index 000000000..b2dad1f39
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES2NEWT.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 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:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution 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.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.test.junit.jogl.caps;
+
+import javax.media.opengl.GLAutoDrawable;
+import javax.media.opengl.GLCapabilities;
+import javax.media.opengl.GLCapabilitiesChooser;
+import javax.media.opengl.GLEventListener;
+import javax.media.opengl.GLProfile;
+
+import org.junit.Test;
+
+import com.jogamp.newt.opengl.GLWindow;
+import com.jogamp.opengl.test.junit.jogl.demos.es2.MultisampleDemoES2;
+import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.UITestCase;
+import com.jogamp.opengl.util.GLReadBufferUtil;
+import com.jogamp.opengl.util.texture.TextureIO;
+
+public class TestMultisampleES2NEWT extends UITestCase {
+  static long durationPerTest = 60; // ms
+  private GLWindow window;
+
+  public static void main(String[] args) {
+     for(int i=0; i<args.length; i++) {
+        if(args[i].equals("-time")) {
+            durationPerTest = MiscUtils.atoi(args[++i], 500);
+        }
+     }
+     System.out.println("durationPerTest: "+durationPerTest);
+     String tstname = TestMultisampleES2NEWT.class.getName();
+     org.junit.runner.JUnitCore.main(tstname);
+  }
+
+  @Test(timeout = 3000) // 3s timeout
+  public void testOnscreenMultiSampleAA0() throws InterruptedException {
+    testMultiSampleAAImpl(false, false, 0);
+  }
+
+  @Test(timeout = 3000) // 3s timeout
+  public void testOnscreenMultiSampleAA8() throws InterruptedException {
+    testMultiSampleAAImpl(false, false, 8);
+  }
+
+  @Test(timeout = 3000) // 3s timeout
+  public void testOffscreenPBufferMultiSampleAA0() throws InterruptedException {
+    testMultiSampleAAImpl(false, true, 0);
+  }
+
+  @Test(timeout = 3000) // 3s timeout
+  public void testOffsreenPBufferMultiSampleAA8() throws InterruptedException {
+    testMultiSampleAAImpl(false, true, 8);
+  }
+
+  @Test(timeout = 3000) // 3s timeout
+  public void testOffscreenFBOMultiSampleAA0() throws InterruptedException {
+    testMultiSampleAAImpl(true, false, 0);
+  }
+
+  @Test(timeout = 3000) // 3s timeout
+  public void testOffsreenFBOMultiSampleAA8() throws InterruptedException {
+    testMultiSampleAAImpl(true, false, 8);
+  }
+
+  private void testMultiSampleAAImpl(boolean useFBO, boolean usePBuffer, int reqSamples) throws InterruptedException {
+    if(useFBO) {
+        System.err.println("NEWT offscreen FBO Window n/a yet");
+        return;
+    }
+    final GLReadBufferUtil screenshot = new GLReadBufferUtil(true, false);
+    GLProfile glp = GLProfile.getGL2ES2();
+    GLCapabilities caps = new GLCapabilities(glp);
+    GLCapabilitiesChooser chooser = new MultisampleChooser01();
+
+    caps.setAlphaBits(1);
+    caps.setFBO(useFBO);
+    caps.setPBuffer(usePBuffer);
+    
+    if(reqSamples>0) {
+        caps.setSampleBuffers(true);
+        caps.setNumSamples(reqSamples);
+    }
+
+    window = GLWindow.create(caps);
+    window.setCapabilitiesChooser(chooser);
+    window.addGLEventListener(new MultisampleDemoES2(reqSamples>0?true:false));
+    window.addGLEventListener(new GLEventListener() {
+        int displayCount = 0;
+        public void init(GLAutoDrawable drawable) {}
+        public void dispose(GLAutoDrawable drawable) {}
+        public void display(GLAutoDrawable drawable) {
+            snapshot(getSimpleTestName("."), displayCount++, null, drawable.getGL(), screenshot, TextureIO.PNG, null);
+        }
+        public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { }
+    });
+    window.setSize(512, 512);
+    window.setVisible(true);
+    window.requestFocus();
+
+    Thread.sleep(durationPerTest);
+
+    window.destroy();
+  }
+
+}
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 5c82a43c6..e81d1b4af 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
@@ -129,12 +129,13 @@ public class GearsES1 implements GLEventListener {
             
     gl.glEnable(GL2ES1.GL_NORMALIZE);
                 
-    if (drawable.getNativeSurface() instanceof Window) {
-        Window window = (Window) drawable.getNativeSurface();
+    final Object upstreamWidget = drawable.getUpstreamWidget();
+    if (upstreamWidget instanceof Window) {            
+        final Window window = (Window) upstreamWidget;
         window.addMouseListener(gearsMouse);
         window.addKeyListener(gearsKeys);
-    } else if (GLProfile.isAWTAvailable() && drawable instanceof java.awt.Component) {
-        java.awt.Component comp = (java.awt.Component) drawable;
+    } else if (GLProfile.isAWTAvailable() && upstreamWidget instanceof java.awt.Component) {
+        final java.awt.Component comp = (java.awt.Component) upstreamWidget;
         new com.jogamp.newt.event.awt.AWTMouseAdapter(gearsMouse).addTo(comp);
         new com.jogamp.newt.event.awt.AWTKeyAdapter(gearsKeys).addTo(comp);
     }
@@ -165,8 +166,9 @@ public class GearsES1 implements GLEventListener {
 
   public void dispose(GLAutoDrawable drawable) {
     System.err.println(Thread.currentThread()+" GearsES1.dispose ... ");
-    if (drawable.getNativeSurface() instanceof Window) {
-        Window window = (Window) drawable.getNativeSurface();
+    final Object upstreamWidget = drawable.getUpstreamWidget();
+    if (upstreamWidget instanceof Window) {            
+        final Window window = (Window) upstreamWidget;
         window.removeMouseListener(gearsMouse);
         window.removeKeyListener(gearsKeys);
     }
@@ -188,8 +190,9 @@ public class GearsES1 implements GLEventListener {
     GL2ES1 gl = drawable.getGL().getGL2ES1();
 
     final boolean hasFocus;
-    if(drawable.getNativeSurface() instanceof NativeWindow) {
-      hasFocus = ((NativeWindow)drawable.getNativeSurface()).hasFocus();
+    final Object upstreamWidget = drawable.getUpstreamWidget();
+    if(upstreamWidget instanceof NativeWindow) {
+      hasFocus = ((NativeWindow)upstreamWidget).hasFocus();
     } else {
       hasFocus = true;
     }
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/caps/MultisampleDemoES1.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/MultisampleDemoES1.java
index 0aaf4b020..aad56581b 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/caps/MultisampleDemoES1.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/MultisampleDemoES1.java
@@ -38,24 +38,16 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.opengl.test.junit.jogl.caps;
+package com.jogamp.opengl.test.junit.jogl.demos.es1;
 
-import jogamp.opengl.x11.glx.GLX;
-import jogamp.opengl.x11.glx.X11GLXGraphicsConfiguration;
-import javax.media.nativewindow.AbstractGraphicsConfiguration;
-import javax.media.nativewindow.NativeWindowFactory;
 import javax.media.opengl.GL;
 import javax.media.opengl.GL2ES1;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLEventListener;
-import javax.media.opengl.GLPipelineFactory;
 
 import com.jogamp.opengl.util.ImmModeSink;
 
-class MultisampleDemoES1 implements GLEventListener {
-
-    static boolean glDebug = false;
-    static boolean glTrace = false;
+public class MultisampleDemoES1 implements GLEventListener {
 
     boolean multisample;
     ImmModeSink immModeSink;
@@ -70,30 +62,7 @@ class MultisampleDemoES1 implements GLEventListener {
         System.err.println();
         System.err.println("Chosen   : " + drawable.getChosenGLCapabilities());
         System.err.println();
-        if (!drawable.getGL().isGLES() && NativeWindowFactory.TYPE_X11.equals(NativeWindowFactory.getNativeWindowType(false))) {
-            AbstractGraphicsConfiguration config = drawable.getNativeSurface().getGraphicsConfiguration();
-            X11GLXGraphicsConfiguration x11config = (X11GLXGraphicsConfiguration) config;
-            long display = drawable.getNativeSurface().getDisplayHandle();
-            int[] foo = new int[1];
-            GLX.glXGetFBConfigAttrib(display, x11config.getFBConfig(), GLX.GLX_SAMPLES, foo, 0);
-            System.out.println("GLX_SAMPLES " + foo[0]);
-            GLX.glXGetFBConfigAttrib(display, x11config.getFBConfig(), GLX.GLX_SAMPLE_BUFFERS, foo, 0);
-            System.out.println("GLX_SAMPLE_BUFFERS " + foo[0]);
-        }
-        GL _gl = drawable.getGL();
-        if (glDebug) {
-            try {
-                // Debug ..
-                _gl = _gl.getContext().setGL(GLPipelineFactory.create("javax.media.opengl.Debug", GL2ES1.class, _gl, null));
-                if (glTrace) {
-                    // Trace ..
-                    _gl = _gl.getContext().setGL(GLPipelineFactory.create("javax.media.opengl.Trace", GL2ES1.class, _gl, new Object[]{System.err}));
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        GL2ES1 gl = _gl.getGL2ES1();
+        GL2ES1 gl = drawable.getGL().getGL2ES1();
         if (multisample) {
             gl.glEnable(GL.GL_MULTISAMPLE);
         }
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/FBOMix2DemosES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/FBOMix2DemosES2.java
new file mode 100644
index 000000000..3dfbb4893
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/FBOMix2DemosES2.java
@@ -0,0 +1,309 @@
+/**
+ * Copyright (C) 2011 JogAmp Community. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.jogamp.opengl.test.junit.jogl.demos.es2;
+
+import java.nio.FloatBuffer;
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2ES2;
+import javax.media.opengl.GLAutoDrawable;
+import javax.media.opengl.GLEventListener;
+import javax.media.opengl.GLUniformData;
+import javax.media.opengl.fixedfunc.GLMatrixFunc;
+
+import com.jogamp.opengl.FBObject;
+import com.jogamp.opengl.FBObject.TextureAttachment;
+import com.jogamp.opengl.FBObject.Attachment.Type;
+import com.jogamp.opengl.util.GLArrayDataServer;
+import com.jogamp.opengl.util.PMVMatrix;
+import com.jogamp.opengl.util.glsl.ShaderCode;
+import com.jogamp.opengl.util.glsl.ShaderProgram;
+import com.jogamp.opengl.util.glsl.ShaderState;
+
+public class FBOMix2DemosES2 implements GLEventListener {
+    private final GearsES2 demo0;
+    private final RedSquareES2 demo1;
+    private final int swapInterval;
+    private int numSamples;
+    private boolean demo0Only;
+    
+    
+    private final ShaderState st;
+    private final PMVMatrix pmvMatrix;
+    
+    private final FBObject fbo0;    
+    private final FBObject fbo1;
+    
+    private TextureAttachment fbo0Tex;
+    private TextureAttachment fbo1Tex;
+        
+    private ShaderProgram sp0;
+    private GLUniformData pmvMatrixUniform;
+    private GLArrayDataServer interleavedVBO;
+    private GLUniformData texUnit0;
+    private GLUniformData texUnit1;
+    
+    public FBOMix2DemosES2(int swapInterval) {
+        demo0 = new GearsES2(-1);
+        demo0.setIsFBOSlave(true);
+        demo1 = new RedSquareES2(-1);
+        demo1.setIsFBOSlave(true);
+        this.swapInterval = swapInterval;
+        
+        st = new ShaderState();
+        // st.setVerbose(true);        
+        pmvMatrix = new PMVMatrix();
+        
+        fbo0 = new FBObject();        
+        fbo1 = new FBObject();
+        
+        numSamples = 0;
+        demo0Only = false;
+    }
+    
+    public void setDemo0Only(boolean v) { 
+        this.demo0Only = v; 
+    }
+    public boolean getDemo0Only() { return demo0Only; }
+    
+    public void setMSAA(int numSamples) { 
+        this.numSamples=numSamples; 
+    }
+    public int getMSAA() { return numSamples; }
+    
+    public void setDoRotation(boolean rotate) { demo1.setDoRotation(rotate); }
+    
+    static final String[] es2_prelude = { "#version 100\n", "precision mediump float;\n" };
+    static final String gl2_prelude = "#version 110\n";
+    
+    @Override
+    public void init(GLAutoDrawable drawable) {
+        final GL2ES2 gl = drawable.getGL().getGL2ES2();
+        
+        demo0.init(drawable);
+        demo1.init(drawable);
+        
+        final ShaderCode vp0 = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, FBOMix2DemosES2.class, "shader",
+                "shader/bin", "texture01_xxx", true);
+        final ShaderCode fp0 = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, FBOMix2DemosES2.class, "shader",
+                "shader/bin", "texture02_xxx", true);
+        
+        // Prelude shader code w/ GLSL profile specifics [ 1. pre-proc, 2. other ]
+        int fp0Pos;
+        if(gl.isGLES2()) {
+            vp0.insertShaderSource(0, 0, es2_prelude[0]);
+            fp0Pos = fp0.insertShaderSource(0, 0, es2_prelude[0]);
+        } else {
+            vp0.insertShaderSource(0, 0, gl2_prelude);
+            fp0Pos = fp0.insertShaderSource(0, 0, gl2_prelude);
+        }
+        if(gl.isGLES2()) {
+            fp0Pos = fp0.insertShaderSource(0, fp0Pos, es2_prelude[1]);
+        }        
+        
+        sp0 = new ShaderProgram();
+        sp0.add(gl, vp0, System.err);
+        sp0.add(gl, fp0, System.err);       
+        st.attachShaderProgram(gl, sp0, true);
+        
+        pmvMatrixUniform = new GLUniformData("mgl_PMVMatrix", 4, 4, pmvMatrix.glGetPMvMatrixf());
+        st.ownUniform(pmvMatrixUniform);       
+        st.uniform(gl, pmvMatrixUniform);
+        
+        interleavedVBO = GLArrayDataServer.createGLSLInterleaved(3+4+2, GL.GL_FLOAT, false, 3*4, GL.GL_STATIC_DRAW);
+        {        
+            interleavedVBO.addGLSLSubArray("mgl_Vertex",        3, GL.GL_ARRAY_BUFFER);            
+            interleavedVBO.addGLSLSubArray("mgl_Color",         4, GL.GL_ARRAY_BUFFER);            
+            //interleavedVBO.addGLSLSubArray("mgl_Normal",        3, GL.GL_ARRAY_BUFFER);
+            interleavedVBO.addGLSLSubArray("mgl_MultiTexCoord", 2, GL.GL_ARRAY_BUFFER);
+
+            FloatBuffer ib = (FloatBuffer)interleavedVBO.getBuffer();
+            
+            for(int i=0; i<4; i++) {
+                ib.put(s_quadVertices,  i*3, 3);
+                ib.put(s_quadColors,    i*4, 4);  
+                //ib.put(s_cubeNormals,   i*3, 3);
+                ib.put(s_quadTexCoords, i*2, 2);
+            }                        
+        }
+        interleavedVBO.seal(gl, true);
+        interleavedVBO.enableBuffer(gl, false);
+        st.ownAttribute(interleavedVBO, true);
+                
+        texUnit0 = new GLUniformData("mgl_Texture0", 0);
+        st.ownUniform(texUnit0);       
+        st.uniform(gl, texUnit0);
+        texUnit1 = new GLUniformData("mgl_Texture1", 1);
+        st.ownUniform(texUnit1);       
+        st.uniform(gl, texUnit1);
+        
+        st.useProgram(gl, false);
+        
+        System.err.println("**** Init");
+        resetFBOs(gl, drawable);
+        
+        fbo0.attachRenderbuffer(gl, Type.DEPTH, 24);
+        fbo0.unbind(gl);
+        fbo1.attachRenderbuffer(gl, Type.DEPTH, 24);
+        fbo1.unbind(gl);
+        gl.glEnable(GL2ES2.GL_DEPTH_TEST);
+        
+        numSamples=fbo0.getNumSamples();
+    }
+    
+    /** Since we switch MSAA and non-MSAA we need to take extra care, i.e. sync msaa for both FBOs ..*/
+    private void resetFBOs(GL gl, GLAutoDrawable drawable) {
+        // remove all texture attachments, since MSAA uses just color-render-buffer
+        // and non-MSAA uses texture2d-buffer
+        fbo0.detachAllColorbuffer(gl);
+        fbo1.detachAllColorbuffer(gl);
+            
+        fbo0.reset(gl, drawable.getWidth(), drawable.getHeight(), numSamples);
+        fbo1.reset(gl, drawable.getWidth(), drawable.getHeight(), numSamples);
+        if(fbo0.getNumSamples() != fbo1.getNumSamples()) {
+            throw new InternalError("sample size mismatch: \n\t0: "+fbo0+"\n\t1: "+fbo1);
+        }        
+        numSamples = fbo0.getNumSamples();
+        
+        if(numSamples>0) {
+            fbo0.attachColorbuffer(gl, 0, true);
+            fbo1.attachColorbuffer(gl, 0, true);
+            fbo0Tex = fbo0.getSamplingSink();
+            fbo1Tex = fbo1.getSamplingSink();
+        } else {
+            fbo0Tex = fbo0.attachTexture2D(gl, 0, true);
+            fbo1Tex = fbo1.attachTexture2D(gl, 0, true);
+        }        
+    }
+
+    @Override
+    public void dispose(GLAutoDrawable drawable) {
+        final GL2ES2 gl = drawable.getGL().getGL2ES2();
+        demo0.dispose(drawable);
+        demo1.dispose(drawable);
+        fbo0.destroy(gl);
+        fbo1.destroy(gl);
+        st.destroy(gl);
+        
+        fbo0Tex = null;
+        fbo1Tex = null;
+        sp0 = null;
+        pmvMatrixUniform = null;
+        interleavedVBO = null;
+    }
+
+    @Override
+    public void display(GLAutoDrawable drawable) {
+        final GL2ES2 gl = drawable.getGL().getGL2ES2();
+
+        if( fbo0.getNumSamples() != numSamples ) {
+            System.err.println("**** NumSamples: "+fbo0.getNumSamples()+" -> "+numSamples);
+            resetFBOs(gl, drawable);
+        }
+        
+        if(0 < numSamples) {
+            gl.glEnable(GL.GL_MULTISAMPLE);
+        }
+        
+        fbo0.bind(gl);
+        demo0.display(drawable);
+        fbo0.unbind(gl);
+        
+        if(!demo0Only) {
+            fbo1.bind(gl);
+            demo1.display(drawable);
+            fbo1.unbind(gl);
+        }
+        
+        st.useProgram(gl, true);
+        gl.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+        gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+        
+        gl.glActiveTexture(GL.GL_TEXTURE0 + texUnit0.intValue());
+        fbo0.use(gl, fbo0Tex);
+        if(!demo0Only) {
+            gl.glActiveTexture(GL.GL_TEXTURE0 + texUnit1.intValue());
+            fbo1.use(gl, fbo1Tex);
+        }
+        interleavedVBO.enableBuffer(gl, true);
+        
+        gl.glDrawArrays(GL.GL_TRIANGLE_STRIP, 0, 4);
+        
+        interleavedVBO.enableBuffer(gl, false);
+        fbo0.unuse(gl);
+        if(!demo0Only) {
+            fbo1.unuse(gl);
+        }
+        
+        st.useProgram(gl, false);        
+    }
+
+    @Override
+    public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
+        final GL2ES2 gl = drawable.getGL().getGL2ES2();
+        
+        if(-1 != swapInterval) {        
+            gl.setSwapInterval(swapInterval); // in case switching the drawable (impl. may bound attribute there)
+        }
+        
+        // if(drawable.getWidth() == fbo0.getWidth() && drawable.getHeight() == fbo0.getHeight() ) {
+            System.err.println("**** Reshape: "+width+"x"+height);
+            resetFBOs(gl, drawable);            
+        //}        
+        
+        fbo0.bind(gl);
+        demo0.reshape(drawable, x, y, width, height);
+        fbo0.unbind(gl);
+        fbo1.bind(gl);
+        demo1.reshape(drawable, x, y, width, height);
+        fbo1.unbind(gl);
+        
+        pmvMatrix.glMatrixMode(GLMatrixFunc.GL_PROJECTION);
+        pmvMatrix.glLoadIdentity();
+        pmvMatrix.glOrthof(-1.0f, 1.0f, -1.0f, 1.0f, 0.0f, 10.0f);
+
+        pmvMatrix.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
+        pmvMatrix.glLoadIdentity();
+        
+        st.useProgram(gl, true);
+        st.uniform(gl, pmvMatrixUniform);
+        st.useProgram(gl, false);
+        
+    }
+
+    private static final float[] s_quadVertices = { 
+      -1f, -1f, 0f, // LB
+       1f, -1f, 0f, // RB
+      -1f,  1f, 0f, // LT
+       1f,  1f, 0f  // RT 
+    };
+    private static final float[] s_quadColors = { 
+      1f, 1f, 1f, 1f,
+      1f, 1f, 1f, 1f,
+      1f, 1f, 1f, 1f,
+      1f, 1f, 1f, 1f };
+    private static final float[] s_quadTexCoords = { 
+            0f, 0f, // LB
+            1f, 0f, // RB
+            0f, 1f, // LT   
+            1f, 1f  // RT
+    };
+}
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 6aea5bb9c..38e8a15ce 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
@@ -65,6 +65,7 @@ public class GearsES2 implements GLEventListener {
 
     private int prevMouseX, prevMouseY;
     private boolean isInitialized = false;
+    boolean isFBOSlave = false;
 
     public GearsES2(int swapInterval) {
         this.swapInterval = swapInterval;
@@ -74,6 +75,8 @@ public class GearsES2 implements GLEventListener {
         this.swapInterval = 1;
     }
 
+    public void setIsFBOSlave(boolean v) { isFBOSlave = v; }
+    
     public void setPMVUseBackingArray(boolean pmvUseBackingArray) {
         this.pmvUseBackingArray = pmvUseBackingArray;
     }
@@ -115,7 +118,6 @@ public class GearsES2 implements GLEventListener {
         System.err.println("GL_RENDERER: " + gl.glGetString(GL.GL_RENDERER));
         System.err.println("GL_VERSION: " + gl.glGetString(GL.GL_VERSION));
 
-        gl.glEnable(GL.GL_CULL_FACE);
         gl.glEnable(GL.GL_DEPTH_TEST);
         
         st = new ShaderState();
@@ -168,13 +170,14 @@ public class GearsES2 implements GLEventListener {
             gear3 = new GearsObjectES2(gear3, pmvMatrix, pmvMatrixUniform, colorU);
             System.err.println("gear3 reused: "+gear3);
         }                
-        
-        if (drawable.getNativeSurface() instanceof Window) {
-            Window window = (Window) drawable.getNativeSurface();
+    
+        final Object upstreamWidget = drawable.getUpstreamWidget();
+        if (upstreamWidget instanceof Window) {
+            final Window window = (Window) upstreamWidget;
             window.addMouseListener(gearsMouse);
             window.addKeyListener(gearsKeys);
-        } else if (GLProfile.isAWTAvailable() && drawable instanceof java.awt.Component) {
-            java.awt.Component comp = (java.awt.Component) drawable;
+        } else if (GLProfile.isAWTAvailable() && upstreamWidget instanceof java.awt.Component) {
+            final java.awt.Component comp = (java.awt.Component) upstreamWidget;
             new com.jogamp.newt.event.awt.AWTMouseAdapter(gearsMouse).addTo(comp);
             new com.jogamp.newt.event.awt.AWTKeyAdapter(gearsKeys).addTo(comp);
         }
@@ -187,7 +190,9 @@ public class GearsES2 implements GLEventListener {
         System.err.println(Thread.currentThread()+" GearsES2.reshape "+x+"/"+y+" "+width+"x"+height+", swapInterval "+swapInterval);
         GL2ES2 gl = drawable.getGL().getGL2ES2();
 
-        gl.setSwapInterval(swapInterval); // in case switching the drawable (impl. may bound attribute there)
+        if(-1 != swapInterval) {
+            gl.setSwapInterval(swapInterval); // in case switching the drawable (impl. may bound attribute there)
+        }
         
         st.useProgram(gl, true);
         pmvMatrix.glMatrixMode(PMVMatrix.GL_PROJECTION);
@@ -218,8 +223,9 @@ public class GearsES2 implements GLEventListener {
         }
         isInitialized = false;
         System.err.println(Thread.currentThread()+" GearsES2.dispose ... ");
-        if (drawable.getNativeSurface() instanceof Window) {
-            Window window = (Window) drawable.getNativeSurface();
+        final Object upstreamWidget = drawable.getUpstreamWidget();
+        if (upstreamWidget instanceof Window) {            
+            final Window window = (Window) upstreamWidget;
             window.removeMouseListener(gearsMouse);
             window.removeKeyListener(gearsKeys);
         }
@@ -235,6 +241,7 @@ public class GearsES2 implements GLEventListener {
         colorU = null;        
         st.destroy(gl);
         st = null;
+
         System.err.println(Thread.currentThread()+" GearsES2.dispose FIN");
     }
 
@@ -246,12 +253,16 @@ public class GearsES2 implements GLEventListener {
         GL2ES2 gl = drawable.getGL().getGL2ES2();
 
         final boolean hasFocus;
-        if(drawable.getNativeSurface() instanceof NativeWindow) {
-          hasFocus = ((NativeWindow)drawable.getNativeSurface()).hasFocus();
+        final Object upstreamWidget = drawable.getUpstreamWidget();
+        if(upstreamWidget instanceof NativeWindow) {
+          hasFocus = ((NativeWindow)upstreamWidget).hasFocus();
         } else {
           hasFocus = true;
         }
-        if(hasFocus) {
+        
+        gl.glEnable(GL.GL_CULL_FACE);
+        
+        if( isFBOSlave || hasFocus ) {
           gl.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
         } else {
           gl.glClearColor(0.2f, 0.2f, 0.2f, 0.0f);
@@ -278,7 +289,9 @@ public class GearsES2 implements GLEventListener {
         gear2.draw(gl,  3.1f, -2.0f, -2f * angle -  9.0f, GearsObject.green);
         gear3.draw(gl, -3.1f,  4.2f, -2f * angle - 25.0f, GearsObject.blue);    
         pmvMatrix.glPopMatrix();
-        st.useProgram(gl, false);        
+        st.useProgram(gl, false);
+        
+        gl.glDisable(GL.GL_CULL_FACE);
     }
     
     boolean confinedFixedCenter = false;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/MultisampleDemoES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/MultisampleDemoES2.java
new file mode 100644
index 000000000..5facc1a49
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/MultisampleDemoES2.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 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:
+ *
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistribution 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.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ *
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ *
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package com.jogamp.opengl.test.junit.jogl.demos.es2;
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2ES2;
+import javax.media.opengl.GLAutoDrawable;
+import javax.media.opengl.GLEventListener;
+import javax.media.opengl.GLUniformData;
+import javax.media.opengl.fixedfunc.GLMatrixFunc;
+
+import com.jogamp.opengl.util.ImmModeSink;
+import com.jogamp.opengl.util.PMVMatrix;
+import com.jogamp.opengl.util.glsl.ShaderCode;
+import com.jogamp.opengl.util.glsl.ShaderProgram;
+import com.jogamp.opengl.util.glsl.ShaderState;
+
+public class MultisampleDemoES2 implements GLEventListener {
+
+    private boolean multisample;
+    private final ShaderState st;
+    private final PMVMatrix pmvMatrix;
+    private ShaderProgram sp0;
+    private GLUniformData pmvMatrixUniform;
+    private ImmModeSink immModeSink;
+
+    public MultisampleDemoES2(boolean multisample) {
+        this.multisample = multisample;
+        st = new ShaderState();
+        st.setVerbose(true);        
+        pmvMatrix = new PMVMatrix();        
+    }
+
+    static final String[] es2_prelude = { "#version 100\n", "precision mediump float;\n" };
+    static final String gl2_prelude = "#version 110\n";
+    
+    public void init(GLAutoDrawable glad) {
+        final GL2ES2 gl = glad.getGL().getGL2ES2();
+        System.err.println();
+        System.err.println("Requested: " + glad.getNativeSurface().getGraphicsConfiguration().getRequestedCapabilities());
+        System.err.println();
+        System.err.println("Chosen   : " + glad.getChosenGLCapabilities());
+        System.err.println();
+        
+        final ShaderCode vp0 = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, MultisampleDemoES2.class, "shader",
+                "shader/bin", "mgl_default_xxx", true);
+        final ShaderCode fp0 = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, MultisampleDemoES2.class, "shader",
+                "shader/bin", "mgl_default_xxx", true);
+        
+        // Prelude shader code w/ GLSL profile specifics [ 1. pre-proc, 2. other ]
+        int fp0Pos;
+        if(gl.isGLES2()) {
+            vp0.insertShaderSource(0, 0, es2_prelude[0]);
+            fp0Pos = fp0.insertShaderSource(0, 0, es2_prelude[0]);
+        } else {
+            vp0.insertShaderSource(0, 0, gl2_prelude);
+            fp0Pos = fp0.insertShaderSource(0, 0, gl2_prelude);
+        }
+        if(gl.isGLES2()) {
+            fp0Pos = fp0.insertShaderSource(0, fp0Pos, es2_prelude[1]);
+        }        
+        
+        sp0 = new ShaderProgram();
+        sp0.add(gl, vp0, System.err);
+        sp0.add(gl, fp0, System.err);       
+        st.attachShaderProgram(gl, sp0, true);
+        
+        pmvMatrixUniform = new GLUniformData("mgl_PMVMatrix", 4, 4, pmvMatrix.glGetPMvMatrixf());
+        st.ownUniform(pmvMatrixUniform);       
+        st.uniform(gl, pmvMatrixUniform);
+        
+        // Using predef array names, see 
+        //    GLPointerFuncUtil.getPredefinedArrayIndexName(glArrayIndex);
+        immModeSink = ImmModeSink.createGLSL(gl, GL.GL_STATIC_DRAW, 40, 
+                                              3, GL.GL_FLOAT,  // vertex
+                                              4, GL.GL_FLOAT,  // color
+                                              0, GL.GL_FLOAT,// normal
+                                              0, GL.GL_FLOAT); // texture
+        final int numSteps = 20;
+        final double increment = Math.PI / numSteps;
+        final double radius = 1;
+        immModeSink.glBegin(GL.GL_LINES);
+        for (int i = numSteps - 1; i >= 0; i--) {
+            immModeSink.glVertex3f((float) (radius * Math.cos(i * increment)), 
+                                   (float) (radius * Math.sin(i * increment)), 
+                                   0f);
+            immModeSink.glColor4f( 1f, 1f, 1f, 1f ); 
+            immModeSink.glVertex3f((float) (-1.0 * radius * Math.cos(i * increment)), 
+                                   (float) (-1.0 * radius * Math.sin(i * increment)), 
+                                   0f);
+            immModeSink.glColor4f( 1f, 1f, 1f, 1f ); 
+        }
+        immModeSink.glEnd(gl, false);
+        
+        st.useProgram(gl, false);
+    }
+
+    public void dispose(GLAutoDrawable glad) {
+        final GL2ES2 gl = glad.getGL().getGL2ES2();
+        immModeSink.destroy(gl);
+        immModeSink = null;
+        st.destroy(gl);
+    }
+
+    public void display(GLAutoDrawable glad) {
+        final GL2ES2 gl = glad.getGL().getGL2ES2();
+        if (multisample) {
+            gl.glEnable(GL.GL_MULTISAMPLE);
+        }
+        gl.glClearColor(0, 0, 0, 0);
+        //      gl.glEnable(GL.GL_DEPTH_TEST);
+        //      gl.glDepthFunc(GL.GL_LESS);
+        gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+        
+        st.useProgram(gl, true);
+        
+        immModeSink.draw(gl, true);
+        
+        st.useProgram(gl, false);
+    }
+
+    // Unused routines
+    public void reshape(GLAutoDrawable glad, int x, int y, int width, int height) {
+        System.err.println("reshape ..");
+        final GL2ES2 gl = glad.getGL().getGL2ES2();
+        pmvMatrix.glMatrixMode(GLMatrixFunc.GL_PROJECTION);
+        pmvMatrix.glLoadIdentity();
+        // pmvMatrix.glOrthof(-1.0f, 1.0f, -1.0f, 1.0f, -1.0f, 1.0f);
+        pmvMatrix.glOrthof(-1.0f, 1.0f, -1.0f, 1.0f, 0.0f, 10.0f);
+        pmvMatrix.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
+        pmvMatrix.glLoadIdentity();
+        
+        st.useProgram(gl, true);
+        st.uniform(gl, pmvMatrixUniform);
+        st.useProgram(gl, false);
+    }
+
+    public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) {
+    }
+}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java
index 6982d61b7..436c44759 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java
@@ -27,9 +27,9 @@
  */
 package com.jogamp.opengl.test.junit.jogl.demos.es2;
 
+import com.jogamp.newt.Window;
 import com.jogamp.newt.event.MouseAdapter;
 import com.jogamp.newt.event.MouseEvent;
-import com.jogamp.newt.opengl.GLWindow;
 import com.jogamp.opengl.util.GLArrayDataServer;
 import com.jogamp.opengl.util.PMVMatrix;
 import com.jogamp.opengl.util.glsl.ShaderCode;
@@ -37,10 +37,8 @@ import com.jogamp.opengl.util.glsl.ShaderProgram;
 import com.jogamp.opengl.util.glsl.ShaderState;
 import javax.media.opengl.GL;
 import javax.media.opengl.GL2ES2;
-import javax.media.opengl.GLAnimatorControl;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLEventListener;
-import javax.media.opengl.GLRunnable;
 import javax.media.opengl.GLUniformData;
 
 public class RedSquareES2 implements GLEventListener {
@@ -52,10 +50,11 @@ public class RedSquareES2 implements GLEventListener {
     long t0;
     private int swapInterval = 0;
     MyMouseAdapter myMouse = new MyMouseAdapter();
-    GLWindow glWindow = null;
+    Window window = null;
     float aspect = 1.0f;
     boolean doRotate = true;
     boolean isInitialized = false;
+    boolean isFBOSlave = false;
 
     public RedSquareES2(int swapInterval) {
         this.swapInterval = swapInterval;
@@ -65,6 +64,7 @@ public class RedSquareES2 implements GLEventListener {
         this.swapInterval = 1;
     }
         
+    public void setIsFBOSlave(boolean v) { isFBOSlave = v; }
     public void setAspect(float aspect) { this.aspect = aspect; }
     public void setDoRotation(boolean rotate) { this.doRotate = rotate; }
     
@@ -129,13 +129,13 @@ public class RedSquareES2 implements GLEventListener {
         colors.enableBuffer(gl, false);
         
         // OpenGL Render Settings
-        gl.glClearColor(0, 0, 0, 0);
         gl.glEnable(GL2ES2.GL_DEPTH_TEST);
         st.useProgram(gl, false);        
 
-        if (glad instanceof GLWindow) {
-            glWindow = (GLWindow) glad;
-            glWindow.addMouseListener(myMouse);
+        final Object upstreamWidget = glad.getUpstreamWidget();
+        if (!isFBOSlave && upstreamWidget instanceof Window) {
+            window = (Window) upstreamWidget;
+            window.addMouseListener(myMouse);
         }
         t0 = System.currentTimeMillis();
         System.err.println(Thread.currentThread()+" RedSquareES2.init FIN");
@@ -145,6 +145,7 @@ public class RedSquareES2 implements GLEventListener {
         long t1 = System.currentTimeMillis();
 
         GL2ES2 gl = glad.getGL().getGL2ES2();
+        gl.glClearColor(0, 0, 0, 0);
         gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
         st.useProgram(gl, true);
         // One rotation every four seconds
@@ -171,7 +172,9 @@ public class RedSquareES2 implements GLEventListener {
         System.err.println(Thread.currentThread()+" RedSquareES2.reshape "+x+"/"+y+" "+width+"x"+height+", swapInterval "+swapInterval);        
         GL2ES2 gl = glad.getGL().getGL2ES2();
         
-        gl.setSwapInterval(swapInterval); // in case switching the drawable (impl. may bound attribute there)
+        if(-1 != swapInterval) {        
+            gl.setSwapInterval(swapInterval); // in case switching the drawable (impl. may bound attribute there)
+        }
         
         st.useProgram(gl, true);
         // Set location in front of camera
@@ -192,9 +195,9 @@ public class RedSquareES2 implements GLEventListener {
         }
         isInitialized = false;
         System.err.println(Thread.currentThread()+" RedSquareES2.dispose ... ");
-        if (null != glWindow) {
-            glWindow.removeMouseListener(myMouse);
-            glWindow = null;            
+        if (null != window) {
+            window.removeMouseListener(myMouse);
+            window = null;            
         }
         GL2ES2 gl = glad.getGL().getGL2ES2();
         st.destroy(gl);
@@ -207,24 +210,9 @@ public class RedSquareES2 implements GLEventListener {
     class MyMouseAdapter extends MouseAdapter {
         public void mouseClicked(MouseEvent e) {
             System.err.println(e);
-            if(null != glWindow && e.getSource() == glWindow.getDelegatedWindow()) {
-                if(e.getX() < glWindow.getWidth()/2) {
-                    glWindow.setFullscreen(!glWindow.isFullscreen());
-                    System.err.println("setFullscreen: "+glWindow.isFullscreen());
-                } else { 
-                    glWindow.invoke(false, new GLRunnable() {
-                        public boolean run(GLAutoDrawable drawable) {
-                            GL gl = drawable.getGL();
-                            gl.setSwapInterval(gl.getSwapInterval()<=0?1:0);
-                            System.err.println("setSwapInterval: "+gl.getSwapInterval());
-                            final GLAnimatorControl a = drawable.getAnimator();
-                            if( null != a ) {
-                                a.resetFPSCounter();
-                            }
-                            return true;
-                        }
-                    });
-                }                
+            if(null != window && e.getSource() == window) {
+                window.setFullscreen(!window.isFullscreen());
+                System.err.println("setFullscreen: "+window.isFullscreen());
             }
         }
      }
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureSequenceCubeES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureSequenceCubeES2.java
index b04bd07c1..9217e2b53 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureSequenceCubeES2.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureSequenceCubeES2.java
@@ -265,11 +265,12 @@ public class TextureSequenceCubeES2 implements GLEventListener {
 
         st.useProgram(gl, false);
 
-        if (drawable instanceof Window) {
-            Window window = (Window) drawable;
+        final Object upstreamWidget = drawable.getUpstreamWidget();
+        if (upstreamWidget instanceof Window) {            
+            final Window window = (Window) upstreamWidget;
             window.addMouseListener(mouseAction);
-        } else if (GLProfile.isAWTAvailable() && drawable instanceof java.awt.Component) {
-            java.awt.Component comp = (java.awt.Component) drawable;
+        } else if (GLProfile.isAWTAvailable() && upstreamWidget instanceof java.awt.Component) {
+            final java.awt.Component comp = (java.awt.Component) upstreamWidget;
             new com.jogamp.newt.event.awt.AWTMouseAdapter(mouseAction).addTo(comp);
         }
         
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieCube.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieCube.java
index 0b83aacd8..7f2713354 100755
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieCube.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieCube.java
@@ -163,8 +163,9 @@ public class MovieCube implements GLEventListener, GLMediaEventListener {
         mPlayer.start();
 
         boolean added;
-        if (drawable instanceof Window) {
-            Window window = (Window) drawable;
+        final Object upstreamWidget = drawable.getUpstreamWidget();
+        if (upstreamWidget instanceof Window) {            
+            final Window window = (Window) upstreamWidget;
             window.addKeyListener(keyAction);
             added = true;
         } else { added = false; }       
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieSimple.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieSimple.java
index 8210065ab..e17c9e88b 100755
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieSimple.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieSimple.java
@@ -400,8 +400,9 @@ public class MovieSimple implements GLEventListener, GLMediaEventListener {
         
         startTime = System.currentTimeMillis();
         
-        if (drawable instanceof Window) {
-            Window window = (Window) drawable;
+        final Object upstreamWidget = drawable.getUpstreamWidget();
+        if (upstreamWidget instanceof Window) {            
+            final Window window = (Window) upstreamWidget;
             window.addMouseListener(mouseAction);
             winWidth = window.getWidth();
             winHeight = window.getHeight();
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java
index 04563d62e..797a16485 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java
@@ -258,7 +258,6 @@ public class TestGearsES2NEWT extends UITestCase {
 
     public static void main(String args[]) throws IOException {        
         int x=0, y=0, w=640, h=480;
-        boolean useSize = false;
         boolean usePos = false;
         
         for(int i=0; i<args.length; i++) {
@@ -291,11 +290,9 @@ public class TestGearsES2NEWT extends UITestCase {
             } else if(args[i].equals("-width")) {
                 i++;
                 w = MiscUtils.atoi(args[i], w);
-                useSize = true;
             } else if(args[i].equals("-height")) {
                 i++;
                 h = MiscUtils.atoi(args[i], h);
-                useSize = true;
             } else if(args[i].equals("-x")) {
                 i++;
                 x = MiscUtils.atoi(args[i], x);
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestRedSquareES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestRedSquareES2NEWT.java
index 74d52c352..ff231ef91 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestRedSquareES2NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestRedSquareES2NEWT.java
@@ -54,6 +54,7 @@ public class TestRedSquareES2NEWT extends UITestCase {
     static GLProfile.ShutdownType loop_shutdown = null;
     static boolean vsync = false;
     static boolean forceES2 = false;
+    static boolean doRotate = true;
 
     @BeforeClass
     public static void initClass() {
@@ -72,7 +73,9 @@ public class TestRedSquareES2NEWT extends UITestCase {
         glWindow.setTitle("Gears NEWT Test");
         glWindow.setSize(width, height);
 
-        glWindow.addGLEventListener(new RedSquareES2(vsync ? 1 : -1));
+        final RedSquareES2 demo = new RedSquareES2(vsync ? 1 : -1);
+        demo.setDoRotation(doRotate);
+        glWindow.addGLEventListener(demo);
 
         Animator animator = new Animator(glWindow);
         QuitAdapter quitAdapter = new QuitAdapter();
@@ -143,6 +146,8 @@ public class TestRedSquareES2NEWT extends UITestCase {
                 } catch (Exception ex) { ex.printStackTrace(); }
             } else if(args[i].equals("-es2")) {
                 forceES2 = true;
+            } else if(args[i].equals("-norotate")) {
+                doRotate = false;
             } else if(args[i].equals("-loops")) {
                 i++;
                 loops = MiscUtils.atoi(args[i], 1);
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/mgl_default_xxx.fp b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/mgl_default_xxx.fp
new file mode 100644
index 000000000..a26dc9737
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/mgl_default_xxx.fp
@@ -0,0 +1,10 @@
+// Copyright 2012 JogAmp Community. All rights reserved.
+
+varying  vec4          frontColor;
+
+void main (void)
+{
+  gl_FragColor = frontColor;
+  // gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
+}
+
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/mgl_default_xxx.vp b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/mgl_default_xxx.vp
new file mode 100644
index 000000000..097a73e4c
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/mgl_default_xxx.vp
@@ -0,0 +1,14 @@
+//Copyright 2012 JogAmp Community. All rights reserved.
+
+
+uniform mat4    mgl_PMVMatrix[2]; // P, Mv
+attribute vec4  mgl_Vertex;
+attribute vec4  mgl_Color;
+
+varying   vec4  frontColor;
+
+void main(void)
+{
+  frontColor = mgl_Color;
+  gl_Position = mgl_PMVMatrix[0] * mgl_PMVMatrix[1] * mgl_Vertex;
+}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texture02_xxx.fp b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texture02_xxx.fp
new file mode 100644
index 000000000..d222606cd
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texture02_xxx.fp
@@ -0,0 +1,20 @@
+// Copyright 2012 JogAmp Community. All rights reserved.
+
+varying  vec2          mgl_texCoord;
+varying  vec4          frontColor;
+
+uniform sampler2D      mgl_Texture0;
+uniform sampler2D      mgl_Texture1;
+
+const vec4 One = vec4(1.0, 1.0, 1.0, 1.0);
+
+void main (void)
+{
+  vec4 texColor0 = texture2D(mgl_Texture0, mgl_texCoord);
+  vec4 texColor1 = texture2D(mgl_Texture1, mgl_texCoord);
+
+  // gl_FragColor = ( ( texColor0 + texColor1 ) / 2.0 ) * frontColor;
+  // gl_FragColor = mix(texColor0, texColor1, One/2.0) * frontColor;
+  gl_FragColor = min(One, mix(texColor0, texColor1, One/2.0) * 1.6) * frontColor;
+}
+
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 c09119a32..b3166b03b 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
@@ -124,14 +124,15 @@ public class Gears implements GLEventListener {
             
     gl.glEnable(GL2.GL_NORMALIZE);
                 
-    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);    
-    } else if (drawable.getNativeSurface() instanceof Window) {
-        Window window = (Window) drawable.getNativeSurface();
+    final Object upstreamWidget = drawable.getUpstreamWidget();
+    if (upstreamWidget instanceof Window) {            
+        final Window window = (Window) upstreamWidget;
         window.addMouseListener(gearsMouse);
         window.addKeyListener(gearsKeys);
+    } else if (GLProfile.isAWTAvailable() && upstreamWidget instanceof java.awt.Component) {
+        final java.awt.Component comp = (java.awt.Component) upstreamWidget;
+        new AWTMouseAdapter(gearsMouse).addTo(comp);
+        new AWTKeyAdapter(gearsKeys).addTo(comp);    
     }
   }
     
@@ -159,8 +160,9 @@ public class Gears implements GLEventListener {
   public void dispose(GLAutoDrawable drawable) {
     System.err.println("Gears: Dispose");
     try {
-        if (drawable.getNativeSurface() instanceof Window) {
-            Window window = (Window) drawable.getNativeSurface();
+        final Object upstreamWidget = drawable.getUpstreamWidget();
+        if (upstreamWidget instanceof Window) {            
+            final Window window = (Window) upstreamWidget;
             window.removeMouseListener(gearsMouse);
             window.removeKeyListener(gearsKeys);
         }
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGearsGLJPanelAWTBug450.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGLJPanelAWTBug450.java
index e3f33e301..4f97feb4f 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGearsGLJPanelAWTBug450.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGLJPanelAWTBug450.java
@@ -31,6 +31,7 @@ import javax.media.opengl.*;
 
 import com.jogamp.opengl.util.FPSAnimator;
 import com.jogamp.opengl.util.GLReadBufferUtil;
+import com.jogamp.opengl.util.texture.TextureIO;
 
 import javax.media.opengl.awt.GLJPanel;
 import javax.media.opengl.glu.gl2.GLUgl2;
@@ -39,7 +40,6 @@ import com.jogamp.opengl.test.junit.jogl.demos.es2.RedSquareES2;
 import com.jogamp.opengl.test.junit.util.UITestCase;
 import java.awt.AWTException;
 import java.awt.BorderLayout;
-import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.ByteBuffer;
 
@@ -61,7 +61,7 @@ import org.junit.Test;
  *
  * @author Wade Walker (adapted from TestGearsGLJPanelAWT)
  */
-public class TestGearsGLJPanelAWTBug450 extends UITestCase {
+public class TestGLJPanelAWTBug450 extends UITestCase {
     static GLProfile glp;
     static int width, height;
     static int r_x, r_y;
@@ -83,16 +83,10 @@ public class TestGearsGLJPanelAWTBug450 extends UITestCase {
     public static void releaseClass() {
     }
 
-    protected void snapshot(GLAutoDrawable drawable, boolean alpha, boolean flip, String filename) {
-        GLReadBufferUtil screenshot = new GLReadBufferUtil(alpha, false);
-        if(screenshot.readPixels(drawable.getGL(), drawable, flip)) {
-            screenshot.write(new File(filename));
-        }                
-    }
-    
     protected void runTestGL(GLCapabilities caps)
             throws AWTException, InterruptedException, InvocationTargetException
     {
+        final GLReadBufferUtil screenshot = new GLReadBufferUtil(true, false);
         JFrame frame = new JFrame("Swing GLJPanel");
         Assert.assertNotNull(frame);
 
@@ -123,7 +117,7 @@ public class TestGearsGLJPanelAWTBug450 extends UITestCase {
                 }
                 if(0 == f) {
                     System.err.println("BGR ("+r_x+"/"+r_y+"): "+byte0+", "+byte1+", "+byte2+" - OK "+(!failed));
-                    snapshot(drawable, true,  false, getSimpleTestName(".")+".png");
+                    snapshot(getSimpleTestName("."), f, null, gl, screenshot, TextureIO.PNG, null);
                 }
                 f++;
             }
@@ -189,6 +183,6 @@ public class TestGearsGLJPanelAWTBug450 extends UITestCase {
                 } catch (Exception ex) { ex.printStackTrace(); }
             }
         }
-        org.junit.runner.JUnitCore.main(TestGearsGLJPanelAWTBug450.class.getName());
+        org.junit.runner.JUnitCore.main(TestGLJPanelAWTBug450.class.getName());
     }
 }
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLShaderState01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLShaderState01NEWT.java
index 881399ddb..987dedc65 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLShaderState01NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLShaderState01NEWT.java
@@ -47,7 +47,6 @@ import javax.media.opengl.GLUniformData;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.BeforeClass;
 
 /**
  * Testing different vertex attribute (VA) data sets on one shader
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLShaderState02NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLShaderState02NEWT.java
index 6421c2405..91dcfc3c3 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLShaderState02NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLShaderState02NEWT.java
@@ -47,7 +47,6 @@ import javax.media.opengl.GLUniformData;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.BeforeClass;
 
 /**
  * Testing different vertex attribute (VA) data sets on one shader
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/ReadBufferBase.java b/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/ReadBufferBase.java
index e3ca25ae6..4ef7b2719 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/ReadBufferBase.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/ReadBufferBase.java
@@ -85,9 +85,7 @@ public class ReadBufferBase implements GLEventListener {
     }
 
     public void display(GLAutoDrawable drawable) {
-        GL gl = drawable.getGL();
-
-        readBufferUtil.readPixels(gl, drawable, false);
+        readBufferUtil.readPixels(drawable.getGL(), false);
     }
 
 }
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/Surface2File.java b/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/Surface2File.java
index b046df6af..974e32289 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/Surface2File.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/Surface2File.java
@@ -64,7 +64,7 @@ public class Surface2File implements SurfaceUpdatedListener {
                 GL gl = ctx.getGL();
                 // FIXME glFinish() is an expensive paranoia sync, should not be necessary due to spec
                 gl.glFinish();
-                if(readBufferUtil.readPixels(gl, drawable, false)) {
+                if(readBufferUtil.readPixels(gl, false)) {
                     gl.glFinish();
                     try {
                         surface2File();
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAccessor02GLn.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAccessor02GLn.java
index 2121205e2..6100ff377 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAccessor02GLn.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAccessor02GLn.java
@@ -34,6 +34,8 @@ import javax.media.opengl.GLDrawableFactory;
 import javax.media.opengl.GLProfile;
 
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.events.ControlListener;
 import org.eclipse.swt.events.PaintEvent;
 import org.eclipse.swt.events.PaintListener;
 import org.eclipse.swt.graphics.Rectangle;
@@ -146,9 +148,9 @@ public class TestSWTAccessor02GLn extends UITestCase {
         System.err.println("*** device: " + device);
         System.err.println("*** window handle: 0x" + Long.toHexString(nativeWindowHandle));
         
-        ProxySurface proxySurface = factory.createProxySurface(device, nativeWindowHandle, caps, null);
+        final SWTUpstreamHook swtUpstreamHook = new SWTUpstreamHook(canvas);
+        final ProxySurface proxySurface = factory.createProxySurface(device, 0, nativeWindowHandle, caps, null, swtUpstreamHook);
         Assert.assertNotNull( proxySurface );        
-        proxySurface.surfaceSizeChanged( 640, 480 );
         System.err.println("*** ProxySurface: " + proxySurface);
         final GLDrawable drawable = factory.createGLDrawable(proxySurface);
         Assert.assertNotNull( drawable );
@@ -221,6 +223,41 @@ public class TestSWTAccessor02GLn extends UITestCase {
         drawable.setRealized(false);
         canvas.dispose();
     }
+    private static class SWTUpstreamHook implements ProxySurface.UpstreamSurfaceHook, ControlListener {
+        private Canvas c;
+        Rectangle clientArea;
+        public SWTUpstreamHook(Canvas c) {
+            this.c = c ;
+            this.clientArea = c.getClientArea();
+        }
+        @Override
+        public final void create(ProxySurface s) { /* nop */ }
+    
+        @Override
+        public final void destroy(ProxySurface s) { /* nop */ }
+    
+        @Override
+        public final int getWidth(ProxySurface s) {
+            return clientArea.width;
+        }    
+        @Override
+        public final int getHeight(ProxySurface s) {
+            return clientArea.width;
+        }
+        
+        @Override
+        public void controlResized(final ControlEvent arg0) {
+            clientArea = c.getClientArea();
+        }
+        @Override
+        public void controlMoved(ControlEvent e) {
+        }
+        @Override
+        public String toString() {
+            final String us_s = null != c ? c.toString() : "nil"; 
+            return "SETUpstreamSurfaceHook[upstream: "+us_s+"]";
+    }
+    };
 
     @Test
     public void test() throws InterruptedException {
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite01AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite01AWT.java
index f79a73040..6cee319ba 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite01AWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite01AWT.java
@@ -30,7 +30,6 @@ package com.jogamp.opengl.test.junit.jogl.util.texture;
 
 import java.awt.Dimension;
 import java.awt.Frame;
-import java.io.File;
 
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLCapabilities;
@@ -42,6 +41,7 @@ import jogamp.nativewindow.jawt.JAWTUtil;
 
 import com.jogamp.opengl.util.Animator;
 import com.jogamp.opengl.util.GLReadBufferUtil;
+import com.jogamp.opengl.util.texture.TextureIO;
 
 import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
 import com.jogamp.opengl.test.junit.util.UITestCase;
@@ -68,14 +68,10 @@ public class TestGLReadBufferUtilTextureIOWrite01AWT extends UITestCase {
         height = 256;
     }
 
-    protected void snapshot(GLAutoDrawable drawable, boolean alpha, boolean flip, String filename) {
-        GLReadBufferUtil screenshot = new GLReadBufferUtil(alpha, false);
-        if(screenshot.readPixels(drawable.getGL(), drawable, flip)) {
-            screenshot.write(new File(filename));
-        }                
-    }
-    
     protected void testWritePNG_Impl(boolean offscreenLayer) throws InterruptedException {
+        final GLReadBufferUtil screenshotRGB = new GLReadBufferUtil(false, false);
+        final GLReadBufferUtil screenshotRGBA = new GLReadBufferUtil(true, false);
+        
         if(!offscreenLayer && JAWTUtil.isOffscreenLayerRequired()) {
             System.err.println("onscreen layer n/a");
             return;
@@ -96,12 +92,13 @@ public class TestGLReadBufferUtilTextureIOWrite01AWT extends UITestCase {
         glc.setSize(width, height);
         glc.addGLEventListener(new GearsES2(1));
         glc.addGLEventListener(new GLEventListener() {
+            int f = 0;
             public void init(GLAutoDrawable drawable) {}
             public void dispose(GLAutoDrawable drawable) {}
             public void display(GLAutoDrawable drawable) {
-                final String pfmt = drawable.getChosenGLCapabilities().getAlphaBits() > 0 ? "rgba" : "rgb_";
-                snapshot(drawable, true,  false, getSimpleTestName(".")+"-F_rgba-I_"+pfmt+"-"+drawable.getGLProfile().getName()+".png");
-                snapshot(drawable, false, false, getSimpleTestName(".")+"-F_rgb_-I_"+pfmt+"-"+drawable.getGLProfile().getName()+".png");
+                snapshot(getSimpleTestName("."), f, null, drawable.getGL(), screenshotRGBA, TextureIO.PNG, null);
+                snapshot(getSimpleTestName("."), f, null,  drawable.getGL(), screenshotRGB, TextureIO.PNG, null);
+                f++;
             }
             public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { }
         });
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite01NEWT.java
index b5b12035d..5681df0ad 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite01NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite01NEWT.java
@@ -28,8 +28,6 @@
  
 package com.jogamp.opengl.test.junit.jogl.util.texture;
 
-import java.io.File;
-
 import com.jogamp.newt.opengl.GLWindow;
 
 import javax.media.opengl.GLAutoDrawable;
@@ -37,6 +35,7 @@ import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.GLProfile;
 import com.jogamp.opengl.util.GLReadBufferUtil;
+import com.jogamp.opengl.util.texture.TextureIO;
 
 import com.jogamp.opengl.test.junit.util.UITestCase;
 import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
@@ -62,32 +61,26 @@ public class TestGLReadBufferUtilTextureIOWrite01NEWT extends UITestCase {
         height = 256;
     }
 
-    protected void snapshot(GLAutoDrawable drawable, boolean alpha, boolean flip, String filename) {
-        GLReadBufferUtil screenshot = new GLReadBufferUtil(alpha, false);
-        if(screenshot.readPixels(drawable.getGL(), drawable, flip)) {
-            screenshot.write(new File(filename));
-        }                
-    }
-    
     @Test
     public void testOnscreenWritePNG_TGA_PAM() throws InterruptedException {
+        final GLReadBufferUtil screenshotRGB = new GLReadBufferUtil(false, false);
+        final GLReadBufferUtil screenshotRGBA = new GLReadBufferUtil(true, false);
         GLWindow glWindow = GLWindow.create(caps);
         Assert.assertNotNull(glWindow);
         glWindow.setTitle("Shared Gears NEWT Test");
         glWindow.setSize(width, height);
         glWindow.addGLEventListener(new GearsES2(1));
         glWindow.addGLEventListener(new GLEventListener() {
+            int f = 0;
             public void init(GLAutoDrawable drawable) {}
             public void dispose(GLAutoDrawable drawable) {}
             public void display(GLAutoDrawable drawable) {
-                final String pfmt = drawable.getChosenGLCapabilities().getAlphaBits() > 0 ? "rgba" : "rgb_";
-                // snapshot(drawable, false, true,  getSimpleTestName(".")+"-rgb_-"+drawable.getGLProfile().getName()+".ppm");
-                snapshot(drawable, true,  false, getSimpleTestName(".")+"-F_rgba-I_"+pfmt+"-"+drawable.getGLProfile().getName()+".png");
-                snapshot(drawable, true,  false, getSimpleTestName(".")+"-F_rgba-I_"+pfmt+"-"+drawable.getGLProfile().getName()+".tga");
-                snapshot(drawable, true,  true,  getSimpleTestName(".")+"-F_rgba-I_"+pfmt+"-"+drawable.getGLProfile().getName()+".pam");
-                snapshot(drawable, false, false, getSimpleTestName(".")+"-F_rgb_-I_"+pfmt+"-"+drawable.getGLProfile().getName()+".png");
-                snapshot(drawable, false, false, getSimpleTestName(".")+"-F_rgb_-I_"+pfmt+"-"+drawable.getGLProfile().getName()+".tga");
-                snapshot(drawable, false, true,  getSimpleTestName(".")+"-F_rgb_-I_"+pfmt+"-"+drawable.getGLProfile().getName()+".pam");
+                snapshot(getSimpleTestName("."), f++, null, drawable.getGL(), screenshotRGBA, TextureIO.PNG, null);
+                snapshot(getSimpleTestName("."), f++, null,  drawable.getGL(), screenshotRGB, TextureIO.PNG, null);                
+                snapshot(getSimpleTestName("."), f++, null, drawable.getGL(), screenshotRGBA, TextureIO.TGA, null);
+                snapshot(getSimpleTestName("."), f++, null,  drawable.getGL(), screenshotRGB, TextureIO.TGA, null);                
+                snapshot(getSimpleTestName("."), f++, null, drawable.getGL(), screenshotRGBA, TextureIO.PAM, null);
+                snapshot(getSimpleTestName("."), f++, null,  drawable.getGL(), screenshotRGB, TextureIO.PAM, null);                
             }
             public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { }
         });
@@ -98,18 +91,21 @@ public class TestGLReadBufferUtilTextureIOWrite01NEWT extends UITestCase {
 
     @Test
     public void testOffscreenWritePNG() throws InterruptedException {
+        final GLReadBufferUtil screenshotRGB = new GLReadBufferUtil(false, false);
+        final GLReadBufferUtil screenshotRGBA = new GLReadBufferUtil(true, false);
         final GLCapabilities caps2 = WindowUtilNEWT.fixCaps(caps, false, true, false);        
         GLWindow glWindow = GLWindow.create(caps2);
         Assert.assertNotNull(glWindow);
         glWindow.setSize(width, height);
         glWindow.addGLEventListener(new GearsES2(1));
         glWindow.addGLEventListener(new GLEventListener() {
+            int f = 0;
             public void init(GLAutoDrawable drawable) {}
             public void dispose(GLAutoDrawable drawable) {}
             public void display(GLAutoDrawable drawable) {
-                final String pfmt = drawable.getChosenGLCapabilities().getAlphaBits() > 0 ? "rgba" : "rgb_";
-                snapshot(drawable, true,  false, getSimpleTestName(".")+"-F_rgba-I_"+pfmt+"-"+drawable.getGLProfile().getName()+".png");
-                snapshot(drawable, false, false, getSimpleTestName(".")+"-F_rgb_-I_"+pfmt+"-"+drawable.getGLProfile().getName()+".png");
+                snapshot(getSimpleTestName("."), f, null, drawable.getGL(), screenshotRGBA, TextureIO.PNG, null);
+                snapshot(getSimpleTestName("."), f, null,  drawable.getGL(), screenshotRGB, TextureIO.PNG, null);
+                f++;
             }
             public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { }
         });
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite02AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite02AWT.java
index 10dd4ea70..43641fe6d 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite02AWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite02AWT.java
@@ -30,9 +30,6 @@ package com.jogamp.opengl.test.junit.jogl.util.texture;
 
 import java.awt.Dimension;
 import java.awt.Frame;
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLCapabilities;
@@ -45,6 +42,7 @@ import jogamp.nativewindow.jawt.JAWTUtil;
 
 import com.jogamp.opengl.util.Animator;
 import com.jogamp.opengl.util.GLReadBufferUtil;
+import com.jogamp.opengl.util.texture.TextureIO;
 
 import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
 import com.jogamp.opengl.test.junit.util.UITestCase;
@@ -71,20 +69,6 @@ public class TestGLReadBufferUtilTextureIOWrite02AWT extends UITestCase {
         height = 64;
     }
 
-    protected void snapshot(GLAutoDrawable drawable, GLReadBufferUtil screenshot, int i) {
-        final StringWriter filename = new StringWriter();
-        {
-            final PrintWriter pw = new PrintWriter(filename);
-            final String pfmt = drawable.getChosenGLCapabilities().getAlphaBits() > 0 ? "rgba" : "rgb_";
-            pw.printf("%s-F_rgba-I_%s-%s-n%03d-%04dx%04d.png", 
-                    getSimpleTestName("."), pfmt, drawable.getGLProfile().getName(), i, drawable.getWidth(), drawable.getHeight());
-        }
-        drawable.getGL().glFinish(); // poor mans sync ..
-        if(screenshot.readPixels(drawable.getGL(), drawable, false)) {
-            screenshot.write(new File(filename.toString()));
-        }                
-    }
-    
     protected void testWritePNGWithResizeImpl(boolean offscreenLayer) throws InterruptedException {
         if(!offscreenLayer && JAWTUtil.isOffscreenLayerRequired()) {
             System.err.println("onscreen layer n/a");
@@ -127,7 +111,7 @@ public class TestGLReadBufferUtilTextureIOWrite02AWT extends UITestCase {
                 if(snap) {
                     System.err.println("XXX: ["+fw_old+", "+dw_old+"], "+fw+"x"+fh+", "+dw+"x"+dh+", sz_changed "+sz_changed+", snap "+snap);
                     c=0;
-                    snapshot(drawable, screenshot, i++);
+                    snapshot(getSimpleTestName("."), i++, null, drawable.getGL(), screenshot, TextureIO.PNG, null);
                     dw_old = dw;
                     fw_old = fw;
                     Threading.invoke(true, new Runnable() {
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite02NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite02NEWT.java
index ed0791f7c..d1ffa84cf 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite02NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite02NEWT.java
@@ -28,10 +28,6 @@
  
 package com.jogamp.opengl.test.junit.jogl.util.texture;
 
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
 import com.jogamp.newt.opengl.GLWindow;
 
 import javax.media.opengl.GLAutoDrawable;
@@ -41,6 +37,7 @@ import javax.media.opengl.GLProfile;
 
 import com.jogamp.opengl.util.Animator;
 import com.jogamp.opengl.util.GLReadBufferUtil;
+import com.jogamp.opengl.util.texture.TextureIO;
 
 import com.jogamp.opengl.test.junit.util.UITestCase;
 import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
@@ -66,19 +63,6 @@ public class TestGLReadBufferUtilTextureIOWrite02NEWT extends UITestCase {
         height = 64;
     }
 
-    protected void snapshot(GLAutoDrawable drawable, GLReadBufferUtil screenshot, int i) {
-        final StringWriter filename = new StringWriter();
-        {
-            final PrintWriter pw = new PrintWriter(filename);
-            final String pfmt = drawable.getChosenGLCapabilities().getAlphaBits() > 0 ? "rgba" : "rgb_";
-            pw.printf("%s-F_rgba-I_%s-%s-n%03d-%04dx%04d.png", 
-                    getSimpleTestName("."), pfmt, drawable.getGLProfile().getName(), i, drawable.getWidth(), drawable.getHeight());
-        }
-        if(screenshot.readPixels(drawable.getGL(), drawable, false)) {
-            screenshot.write(new File(filename.toString()));
-        }                
-    }
-    
     private void testWritePNGWithResizeImpl(boolean offscreen) throws InterruptedException {
         final GLReadBufferUtil screenshot = new GLReadBufferUtil(true, false);
         final GLCapabilities caps2 = offscreen ? WindowUtilNEWT.fixCaps(caps, false, true, false) : caps;
@@ -110,7 +94,7 @@ public class TestGLReadBufferUtilTextureIOWrite02NEWT extends UITestCase {
                 if(snap) {
                     System.err.println("XXX: ["+dw_old+"], "+dw+"x"+dh+", sz_changed "+sz_changed+", snap "+snap);
                     c=0;
-                    snapshot(drawable, screenshot, i++);
+                    snapshot(getSimpleTestName("."), i++, null, drawable.getGL(), screenshot, TextureIO.PNG, null);
                     dw_old = dw;
                     new Thread() { 
                         @Override
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileAWT.java
index 068732696..0d4f2b01e 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileAWT.java
@@ -52,7 +52,6 @@ import com.jogamp.opengl.util.GLReadBufferUtil;
 import java.awt.Dimension;
 import java.awt.Frame;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLConnection;
@@ -96,16 +95,10 @@ public class TestPNGTextureFromFileAWT extends UITestCase {
         testTextureStream = null;
     }
 
-    protected void snapshot(GLAutoDrawable drawable, String filename) {
-        GLReadBufferUtil screenshot = new GLReadBufferUtil(false, false);
-        if(screenshot.readPixels(drawable.getGL(), drawable, false)) {
-            screenshot.write(new File(filename));
-        }                
-    }
-    
     public void testImpl(boolean useFFP, final InputStream istream, final boolean useAWTIIOP) 
             throws InterruptedException, IOException 
     {
+        final GLReadBufferUtil screenshot = new GLReadBufferUtil(true, false);
         GLProfile glp;
         if(useFFP && GLProfile.isAvailable(GLProfile.GL2GL3)) {
             glp = GLProfile.getGL2GL3();
@@ -137,7 +130,7 @@ public class TestPNGTextureFromFileAWT extends UITestCase {
         // the bug submitter was doing it
         final GLEventListener gle = useFFP ? new TextureDraw01GL2Listener( texData ) : new TextureDraw01ES2Listener( texData ) ;
         glc.addGLEventListener(gle);
-        glc.addGLEventListener(new GLEventListener() {
+        glc.addGLEventListener(new GLEventListener() {            
             boolean shot = false;
             
             @Override public void init(GLAutoDrawable drawable) {}
@@ -147,7 +140,7 @@ public class TestPNGTextureFromFileAWT extends UITestCase {
                 // 1 snapshot
                 if(null!=((TextureDraw01Accessor)gle).getTexture() && !shot) {
                     shot = true;
-                    snapshot(drawable, getSimpleTestName(".")+".png");                            
+                    snapshot(getSimpleTestName("."), 0, null, drawable.getGL(), screenshot, TextureIO.PNG, null);
                 }
             }
 
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileNEWT.java
index d973dea2d..b4faafbe7 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileNEWT.java
@@ -48,7 +48,6 @@ import com.jogamp.opengl.util.texture.TextureIO;
 import com.jogamp.opengl.util.Animator;
 import com.jogamp.opengl.util.GLReadBufferUtil;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLConnection;
@@ -80,14 +79,8 @@ public class TestPNGTextureFromFileNEWT extends UITestCase {
         testTextureStream = null;
     }
 
-    protected void snapshot(GLAutoDrawable drawable, String filename) {
-        GLReadBufferUtil screenshot = new GLReadBufferUtil(false, false);
-        if(screenshot.readPixels(drawable.getGL(), drawable, false)) {
-            screenshot.write(new File(filename));
-        }                
-    }
-    
     public void testImpl(boolean useFFP, final InputStream istream) throws InterruptedException, IOException {
+        final GLReadBufferUtil screenshot = new GLReadBufferUtil(true, false);
         GLProfile glp;
         if(useFFP && GLProfile.isAvailable(GLProfile.GL2GL3)) {
             glp = GLProfile.getGL2GL3();
@@ -119,7 +112,7 @@ public class TestPNGTextureFromFileNEWT extends UITestCase {
                 // 1 snapshot
                 if(null!=((TextureDraw01Accessor)gle).getTexture() && !shot) {
                     shot = true;
-                    snapshot(drawable, getSimpleTestName(".")+".png");                            
+                    snapshot(getSimpleTestName("."), 0, null, drawable.getGL(), screenshot, TextureIO.PNG, null);
                 }
             }
             
diff --git a/src/test/com/jogamp/opengl/test/junit/util/UITestCase.java b/src/test/com/jogamp/opengl/test/junit/util/UITestCase.java
index 672675fab..c07d5b741 100644
--- a/src/test/com/jogamp/opengl/test/junit/util/UITestCase.java
+++ b/src/test/com/jogamp/opengl/test/junit/util/UITestCase.java
@@ -28,7 +28,17 @@
  
 package com.jogamp.opengl.test.junit.util;
 
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GLCapabilitiesImmutable;
+import javax.media.opengl.GLDrawable;
+
 import com.jogamp.common.util.locks.SingletonInstance;
+import com.jogamp.opengl.util.GLReadBufferUtil;
+import com.jogamp.opengl.util.texture.TextureIO;
 
 import org.junit.Assume;
 import org.junit.Before;
@@ -108,6 +118,49 @@ public abstract class UITestCase {
     }
     
     static final String unsupportedTestMsg = "Test not supported on this platform.";
-
+    
+    /**
+     * Takes a snapshot of the drawable's current framebuffer. Example filenames: 
+     * <pre>
+     * TestFBODrawableNEWT.test01-F_rgba-I_rgba-S0_default-GL2-n0004-0800x0600.png
+     * TestFBODrawableNEWT.test01-F_rgba-I_rgba-S0_default-GL2-n0005-0800x0600.png
+     * </pre>
+     * 
+     * @param simpleTestName will be used as the filename prefix
+     * @param sn sequential number 
+     * @param postSNDetail optional detail to be added to the filename after <code>sn</code>
+     * @param gl the current GL context object. It's read drawable is being used as the pixel source and to gather some details which will end up in the filename.
+     * @param readBufferUtil the {@link GLReadBufferUtil} to be used to read the pixels for the screenshot.
+     * @param fileSuffix Optional file suffix without a <i>dot</i> defining the file type, i.e. <code>"png"</code>.
+     *                   If <code>null</code> the <code>"png"</code> as defined in {@link TextureIO#PNG} is being used.
+     * @param destPath Optional platform dependent file path. It shall use {@link File#separatorChar} as is directory separator.
+     *                 It shall not end with a directory separator, {@link File#separatorChar}.
+     *                 If <code>null</code> the current working directory is being used.  
+     */
+    public static void snapshot(String simpleTestName, int sn, String postSNDetail, GL gl, GLReadBufferUtil readBufferUtil, String fileSuffix, String destPath) {
+        if(null == fileSuffix) {
+            fileSuffix = TextureIO.PNG;
+        }
+        final StringWriter filenameSW = new StringWriter();
+        {
+            final GLDrawable drawable = gl.getContext().getGLReadDrawable();
+            final GLCapabilitiesImmutable caps = drawable.getChosenGLCapabilities();
+            final String F_pfmt = readBufferUtil.hasAlpha() ? "rgba" : "rgb_";
+            final String pfmt = caps.getAlphaBits() > 0 ? "rgba" : "rgb_";
+            final String aaext = caps.getSampleExtension();
+            final int samples = caps.getNumSamples() ;
+            postSNDetail = null != postSNDetail ? "-"+postSNDetail : "";
+            final PrintWriter pw = new PrintWriter(filenameSW);
+            pw.printf("%s-n%04d%s-F_%s-I_%s-S%d_%s-%s-%04dx%04d.%s", 
+                    simpleTestName, sn, postSNDetail, F_pfmt, pfmt, samples, aaext, drawable.getGLProfile().getName(), 
+                    drawable.getWidth(), drawable.getHeight(), fileSuffix);
+        }
+        final String filename = null != destPath ? destPath + File.separator + filenameSW.toString() : filenameSW.toString();
+        System.err.println(Thread.currentThread().getName()+": ** screenshot: "+filename);
+        gl.glFinish(); // just make sure rendering finished ..
+        if(readBufferUtil.readPixels(gl, false)) {
+            readBufferUtil.write(new File(filename));
+        }                
+    }    
 }