GLDrawableFactory.createGLDrawable() offscreen: Fix caps - set double-buffer := false to be consistent w/ GLDrawableFactory.createOffscreenDrawable()

TestGLDrawable01NEWT: Enhance test case to run w/ EGLDrawableFactory (ES2) besides GL2 and GLX/WGL/..-Factory

3 files changed, 178 insertions, 185 deletions

diff --git a/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java b/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java
index f7808294b..2f2bf5961 100644
--- a/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java
@@ -143,6 +143,7 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
             // layered surface -> Offscreen/[FBO|PBuffer]
             final GLCapabilities chosenCapsMod = (GLCapabilities) chosenCaps.cloneMutable();
             chosenCapsMod.setOnscreen(false);
+            chosenCapsMod.setDoubleBuffered(false);
             /* if( isFBOAvailable ) { // FIXME JAU: FBO n/a yet
                 chosenCapsMod.setFBO(true);
             } else */ 
@@ -174,17 +175,21 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
             result = createOnscreenDrawableImpl(target);
         } else {
             // offscreen
+            final GLCapabilitiesImmutable reqCaps = (GLCapabilitiesImmutable)config.getRequestedCapabilities();
             if(DEBUG) {
-                System.err.println("GLDrawableFactoryImpl.createGLDrawable -> OffScreenDrawable, FBO-chosen(-avail)/PBuffer: "+chosenCaps.isFBO()+"("+isFBOAvailable+")/"+chosenCaps.isPBuffer()+": "+target);
+                System.err.println("GLDrawableFactoryImpl.createGLDrawable -> OffScreenDrawable, FBO req / chosen - avail, PBuffer: "+reqCaps.isFBO()+" / "+chosenCaps.isFBO()+" - "+isFBOAvailable+", "+chosenCaps.isPBuffer()+": "+target);
             }
             if( ! ( target instanceof MutableSurface ) ) {
                 throw new IllegalArgumentException("Passed NativeSurface must implement SurfaceChangeable for offscreen: "+target);
             }
-            if( ((GLCapabilitiesImmutable)config.getRequestedCapabilities()).isFBO() && isFBOAvailable ) {
+            if( reqCaps.isFBO() && isFBOAvailable ) {
                 // FIXME JAU: Need to revise passed MutableSurface to work w/ FBO ..
                 final GLDrawableImpl dummyDrawable = createOnscreenDrawableImpl(target);                
                 result = new GLFBODrawableImpl(this, dummyDrawable, target, target.getWidth(), target.getHeight(), 0 /* textureUnit */);
             } else {
+                final GLCapabilities chosenCapsMod = (GLCapabilities) chosenCaps.cloneMutable();
+                chosenCapsMod.setDoubleBuffered(false);
+                config.setChosenCapabilities(chosenCapsMod);
                 result = createOffscreenDrawableImpl(target);
             }
         }
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDrawable01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDrawable01NEWT.java
new file mode 100644
index 000000000..a6e9cfb07
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDrawable01NEWT.java
@@ -0,0 +1,171 @@
+/**
+ * Copyright 2010 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+ 
+package com.jogamp.opengl.test.junit.jogl.acore;
+
+import java.io.IOException;
+
+import javax.media.nativewindow.CapabilitiesImmutable;
+import javax.media.opengl.GL;
+import javax.media.opengl.GLCapabilities;
+import javax.media.opengl.GLCapabilitiesImmutable;
+import javax.media.opengl.GLContext;
+import javax.media.opengl.GLDrawable;
+import javax.media.opengl.GLDrawableFactory;
+import javax.media.opengl.GLProfile;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.jogamp.newt.NewtFactory;
+import com.jogamp.newt.Window;
+import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
+import com.jogamp.opengl.test.junit.util.UITestCase;
+
+public class TestGLDrawable01NEWT extends UITestCase {
+    static final int width = 200, height = 200;
+
+    void doTest(String profile, boolean onscreen, boolean fbo, boolean pbuffer) throws InterruptedException {
+        if( !GLProfile.isAvailable(profile) )  {
+            System.err.println("Profile "+profile+" n/a");
+            return;
+        }
+
+        final GLProfile glp = GLProfile.get(profile);
+        final GLCapabilities reqGLCaps = new GLCapabilities(glp);
+        
+        reqGLCaps.setOnscreen(onscreen);
+        reqGLCaps.setPBuffer(!onscreen && pbuffer);
+        reqGLCaps.setFBO(!onscreen && fbo);
+        reqGLCaps.setDoubleBuffered(onscreen);
+        // System.out.println("Requested: "+caps);
+
+        //
+        // Create native windowing resources .. X11/Win/OSX
+        // 
+        Window window = NewtFactory.createWindow(reqGLCaps);
+        Assert.assertNotNull(window);
+        window.setSize(width, height);
+        window.setVisible(true);
+        AWTRobotUtil.waitForVisible(window, true);
+        AWTRobotUtil.waitForRealized(window, true);
+        // System.out.println("Created: "+window);
+
+        // Check caps of NativeWindow config w/o GL
+        final CapabilitiesImmutable chosenCaps = window.getGraphicsConfiguration().getChosenCapabilities();
+        Assert.assertNotNull(chosenCaps);
+        Assert.assertTrue(chosenCaps.getGreenBits()>5);
+        Assert.assertTrue(chosenCaps.getBlueBits()>5);
+        Assert.assertTrue(chosenCaps.getRedBits()>5);
+
+        //
+        // Create native OpenGL resources .. XGL/WGL/CGL .. 
+        // equivalent to GLAutoDrawable methods: setVisible(true)
+        // 
+        final GLDrawableFactory factory = GLDrawableFactory.getFactory(glp);
+        
+        final GLDrawable drawable = factory.createGLDrawable(window);
+        Assert.assertNotNull(drawable);
+        // System.out.println("Pre: "+drawable);
+        //
+        drawable.setRealized(true);
+        Assert.assertTrue(drawable.isRealized());
+
+        // Check caps of GLDrawable after realization
+        final GLCapabilitiesImmutable chosenGLCaps = drawable.getChosenGLCapabilities();
+        Assert.assertNotNull(chosenGLCaps);
+        Assert.assertTrue(chosenGLCaps.getGreenBits()>5);
+        Assert.assertTrue(chosenGLCaps.getBlueBits()>5);
+        Assert.assertTrue(chosenGLCaps.getRedBits()>5);
+        Assert.assertTrue(chosenGLCaps.getDepthBits()>4);
+        Assert.assertEquals(reqGLCaps.isOnscreen(), chosenGLCaps.isOnscreen());
+        Assert.assertEquals(reqGLCaps.isOnscreen(), chosenGLCaps.getDoubleBuffered()); // offscreen shall be !dbl-buffer
+        // System.out.println("Post: "+drawable);
+
+        GLContext context = drawable.createContext(null);
+        Assert.assertNotNull(context);
+        // System.out.println(context);
+        
+        int res = context.makeCurrent();
+        Assert.assertTrue(GLContext.CONTEXT_CURRENT_NEW==res || GLContext.CONTEXT_CURRENT==res);
+
+        // draw something ..
+        final GL gl = context.getGL();
+        gl.glClearColor(1, 1, 1, 1);
+        gl.glEnable(GL.GL_DEPTH_TEST);
+        Assert.assertEquals(GL.GL_NO_ERROR, gl.glGetError());
+        gl.glViewport(0, 0, width, height);        
+        gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+        Assert.assertEquals(GL.GL_NO_ERROR, gl.glGetError());
+
+        drawable.swapBuffers();
+        context.release();
+
+        Thread.sleep(50);
+        
+        context.destroy();    
+        drawable.setRealized(false);
+        window.destroy();
+        // System.out.println("Final: "+window);
+    }
+
+    @Test
+    public void testGL2OnScreen() throws InterruptedException {
+        doTest(GLProfile.GL2, true, false, false);
+    }
+
+    @Test
+    public void testES2OnScreen() throws InterruptedException {
+        doTest(GLProfile.GLES2, true, false, false);
+    }
+    
+    @Test
+    public void testGL2PBuffer() throws InterruptedException {
+        doTest(GLProfile.GL2, false, false, true);
+    }
+
+    @Test
+    public void testES2PBuffer() throws InterruptedException {
+        doTest(GLProfile.GLES2, false, false, true);
+    }
+    
+    // @Test // TODO: FBO-Drawable via createGLDrawable and pre-exisiting NativeSurface
+    public void testGL2FBO() throws InterruptedException {
+        doTest(GLProfile.GL2, false, true, false);
+    }
+
+    // @Test // TODO: FBO-Drawable via createGLDrawable and pre-exisiting NativeSurface
+    public void testES2FBO() throws InterruptedException {
+        doTest(GLProfile.GLES2, false, true, false);
+    }
+    
+    public static void main(String args[]) throws IOException {
+        org.junit.runner.JUnitCore.main(TestGLDrawable01NEWT.class.getName());
+    }
+
+}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/drawable/TestDrawable01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/drawable/TestDrawable01NEWT.java
deleted file mode 100644
index 731f7c867..000000000
--- a/src/test/com/jogamp/opengl/test/junit/jogl/drawable/TestDrawable01NEWT.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * Copyright 2010 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- * 
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- * 
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
- 
-package com.jogamp.opengl.test.junit.jogl.drawable;
-
-import com.jogamp.opengl.test.junit.util.UITestCase;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.AfterClass;
-import org.junit.Test;
-
-import javax.media.opengl.*;
-
-import com.jogamp.newt.*;
-import java.io.IOException;
-
-public class TestDrawable01NEWT extends UITestCase {
-    static GLProfile glp;
-    static GLDrawableFactory factory;
-    static int width, height;
-    GLCapabilities caps;
-    Window window;
-    GLDrawable drawable;
-    GLContext context;
-
-    @BeforeClass
-    public static void initClass() {
-        glp = GLProfile.getDefault();
-        Assert.assertNotNull(glp);
-        factory = GLDrawableFactory.getFactory(glp);
-        Assert.assertNotNull(factory);
-        width  = 640;
-        height = 480;
-    }
-
-    @AfterClass
-    public static void releaseClass() {
-        Assert.assertNotNull(factory);
-        factory=null;
-    }
-
-    @Before
-    public void initTest() {
-        caps = new GLCapabilities(glp);
-        Assert.assertNotNull(caps);
-    }
-
-    void createWindow(boolean onscreen, boolean pbuffer, boolean undecorated) {
-        caps.setOnscreen(onscreen);
-        caps.setPBuffer(!onscreen && pbuffer);
-        caps.setDoubleBuffered(onscreen);
-        // System.out.println("Requested: "+caps);
-
-        //
-        // Create native windowing resources .. X11/Win/OSX
-        // 
-        Display display = NewtFactory.createDisplay(null); // local display
-        Assert.assertNotNull(display);
-
-        Screen screen  = NewtFactory.createScreen(display, 0); // screen 0
-        Assert.assertNotNull(screen);
-
-        window = NewtFactory.createWindow(screen, caps);
-        Assert.assertNotNull(window);
-        window.setUndecorated(onscreen && undecorated);
-        window.setSize(width, height);
-        window.setVisible(true);
-        // System.out.println("Created: "+window);
-
-        //
-        // Create native OpenGL resources .. XGL/WGL/CGL .. 
-        // equivalent to GLAutoDrawable methods: setVisible(true)
-        // 
-        GLCapabilities glCaps = (GLCapabilities) window.getGraphicsConfiguration().getChosenCapabilities();
-        Assert.assertNotNull(glCaps);
-        Assert.assertTrue(glCaps.getGreenBits()>5);
-        Assert.assertTrue(glCaps.getBlueBits()>5);
-        Assert.assertTrue(glCaps.getRedBits()>5);
-        Assert.assertEquals(glCaps.isOnscreen(),onscreen);
-        Assert.assertTrue(onscreen || !pbuffer || glCaps.isPBuffer()); // pass if onscreen, or !pbuffer req. or have pbuffer
-        Assert.assertEquals(glCaps.getDoubleBuffered(),onscreen);
-        Assert.assertTrue(glCaps.getDepthBits()>4);
-
-        drawable = factory.createGLDrawable(window);
-        Assert.assertNotNull(drawable);
-        // System.out.println("Pre: "+drawable);
-        //
-        drawable.setRealized(true);
-        // Assert.assertEquals(width,drawable.getWidth());
-        // Assert.assertEquals(height,drawable.getHeight());
-        // Assert.assertEquals(glCaps,drawable.getChosenGLCapabilities());
-        Assert.assertEquals(window,drawable.getNativeSurface());
-        // System.out.println("Post: "+drawable);
-
-        context = drawable.createContext(null);
-        Assert.assertNotNull(context);
-        // System.out.println(context);
-        
-        int res = context.makeCurrent();
-        Assert.assertTrue(GLContext.CONTEXT_CURRENT_NEW==res || GLContext.CONTEXT_CURRENT==res);
-
-        // draw something ..
-
-        drawable.swapBuffers();
-        context.release();
-
-        // System.out.println("Final: "+window);
-    }
-
-    void destroyWindow() {
-        // GLWindow.dispose(..) sequence
-        Assert.assertNotNull(context);
-        context.destroy();
-
-        Assert.assertNotNull(drawable);
-        drawable.setRealized(false);
-
-        // GLWindow.destroy(..) sequence cont..
-        Assert.assertNotNull(window);
-        window.destroy();
-
-        drawable = null;
-        context = null;
-        window = null;
-    }
-
-    @Test
-    public void testOnScreenDecorated() throws InterruptedException {
-        createWindow(true, false, false);
-        Thread.sleep(1000); // 1000 ms
-        destroyWindow();
-    }
-
-    @Test
-    public void testOnScreenUndecorated() throws InterruptedException {
-        createWindow(true, false, true);
-        Thread.sleep(1000); // 1000 ms
-        destroyWindow();
-    }
-
-    public static void main(String args[]) throws IOException {
-        String tstname = TestDrawable01NEWT.class.getName();
-        org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(new String[] {
-            tstname,
-            "filtertrace=true",
-            "haltOnError=false",
-            "haltOnFailure=false",
-            "showoutput=true",
-            "outputtoformatters=true",
-            "logfailedtests=true",
-            "logtestlistenerevents=true",
-            "formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter",
-            "formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,TEST-"+tstname+".xml" } );
-    }
-
-}