2 files changed, 36 insertions, 10 deletions

diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java
index 3c1f1e2ae..f9a333fc4 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java
@@ -15,7 +15,7 @@ import com.jogamp.opengl.GLAutoDrawable;
 import com.jogamp.opengl.GLEventListener;
 import com.jogamp.opengl.GLPipelineFactory;
 import com.jogamp.opengl.GLRunnable;
-
+import com.jogamp.opengl.JoglVersion;
 import com.jogamp.common.net.Uri;
 import com.jogamp.common.util.IOUtil;
 import com.jogamp.common.util.InterruptSource;
@@ -785,7 +785,6 @@ public class GPUUISceneGLListener0A implements GLEventListener {
         } else {
             System.err.println("GPUUISceneGLListener0A: init (0)");
         }
-        System.err.println("Chosen: "+drawable.getChosenGLCapabilities());
         cDrawable = drawable;
         GL2ES2 gl = drawable.getGL().getGL2ES2();
         if(debug) {
@@ -794,6 +793,10 @@ public class GPUUISceneGLListener0A implements GLEventListener {
         if(trace) {
             gl = gl.getContext().setGL( GLPipelineFactory.create("com.jogamp.opengl.Trace", null, gl, new Object[] { System.err } ) ).getGL2ES2();
         }
+        System.err.println(JoglVersion.getGLInfo(gl, null, false /* withCapsAndExts */).toString());
+        System.err.println("VSync Swap Interval: "+gl.getSwapInterval());
+        System.err.println("Chosen: "+drawable.getChosenGLCapabilities());
+        MSAATool.dump(drawable);
 
         renderer = RegionRenderer.create(rs, RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable);
         rs.setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED);
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneNewtDemo.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneNewtDemo.java
index 1e9ae7a45..e3bec8b22 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneNewtDemo.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneNewtDemo.java
@@ -3,18 +3,29 @@ package com.jogamp.opengl.test.junit.graph.demos;
 import com.jogamp.nativewindow.ScalableSurface;
 import com.jogamp.opengl.GLCapabilities;
 import com.jogamp.opengl.GLProfile;
-
+import com.jogamp.opengl.JoglVersion;
+import com.jogamp.common.util.VersionUtil;
 import com.jogamp.graph.curve.Region;
+import com.jogamp.newt.Display;
+import com.jogamp.newt.NewtFactory;
+import com.jogamp.newt.Screen;
 import com.jogamp.newt.event.WindowAdapter;
 import com.jogamp.newt.event.WindowEvent;
 import com.jogamp.newt.opengl.GLWindow;
 import com.jogamp.opengl.test.junit.util.MiscUtils;
 import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.caps.NonFSAAGLCapabilitiesChooser;
 
 public class GPUUISceneNewtDemo {
     static final boolean DEBUG = false;
     static final boolean TRACE = false;
 
+    static void sleep(final long ms) {
+        try {
+            Thread.sleep(ms);
+        } catch (final InterruptedException ie) {}
+    }
+
     public static void main(final String[] args) {
         int SceneMSAASamples = 0;
         boolean GraphVBAAMode = false;
@@ -96,6 +107,11 @@ public class GPUUISceneNewtDemo {
         System.err.println("Graph VBAA Mode "+GraphVBAAMode);
         System.err.println("Graph Auto Mode "+GraphAutoMode+" no-AA dpi threshold");
 
+        final Display dpy = NewtFactory.createDisplay(null);
+        final Screen screen = NewtFactory.createScreen(dpy, 0);
+        System.err.println(VersionUtil.getPlatformInfo());
+        System.err.println(JoglVersion.getAllAvailableCapabilitiesInfo(dpy.getGraphicsDevice(), null).toString());
+
         final GLProfile glp;
         if(forceGLDef) {
             glp = GLProfile.getDefault();
@@ -126,21 +142,24 @@ public class GPUUISceneNewtDemo {
             rmode = 0;
         }
 
-        final GLWindow window = GLWindow.create(caps);
+        final GLWindow window = GLWindow.create(screen, caps);
+        if( 0 == SceneMSAASamples ) {
+            window.setCapabilitiesChooser(new NonFSAAGLCapabilitiesChooser());
+        }
         window.setPosition(x, y);
         window.setSize(width, height);
         window.setTitle("GraphUI Newt Demo: graph["+Region.getRenderModeString(rmode)+"], msaa "+SceneMSAASamples);
         window.setSurfaceScale(reqSurfacePixelScale);
-        final float[] valReqSurfacePixelScale = window.getRequestedSurfaceScale(new float[2]);
+        // final float[] valReqSurfacePixelScale = window.getRequestedSurfaceScale(new float[2]);
 
-        final GPUUISceneGLListener0A sceneGLListener = 0 < GraphAutoMode ? new GPUUISceneGLListener0A(fontfilename, GraphAutoMode, DEBUG, TRACE) :
-                                                                           new GPUUISceneGLListener0A(fontfilename, rmode, DEBUG, TRACE);
+        final GPUUISceneGLListener0A scene = 0 < GraphAutoMode ? new GPUUISceneGLListener0A(fontfilename, GraphAutoMode, DEBUG, TRACE) :
+                                                                 new GPUUISceneGLListener0A(fontfilename, rmode, DEBUG, TRACE);
 
-        window.addGLEventListener(sceneGLListener);
-        sceneGLListener.attachInputListenerTo(window);
+        window.addGLEventListener(scene);
+        scene.attachInputListenerTo(window);
 
         final Animator animator = new Animator();
-        animator.setUpdateFPSFrames(60, null);
+        animator.setUpdateFPSFrames(5*60, null);
         animator.add(window);
 
         window.addWindowListener(new WindowAdapter() {
@@ -152,5 +171,9 @@ public class GPUUISceneNewtDemo {
 
         window.setVisible(true);
         animator.start();
+
+        // sleep(3000);
+        // final UIShape movie = scene.getWidget(GPUUISceneGLListener0A.BUTTON_MOVIE);
     }
+
 }