diff options
4 files changed, 110 insertions, 11 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 720607077..7a08abe56 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -158,7 +158,7 @@ value="com/jogamp/opengl/**/swt/**"/> <property name="java.part.util" - value="com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/av/* com/jogamp/opengl/util/packrect/** com/jogamp/opengl/util/PNG* com/jogamp/opengl/util/stereo/** jogamp/opengl/util/av/** jogamp/opengl/util/jpeg/** jogamp/opengl/util/pngj/** jogamp/opengl/util/stereo/**"/> + value="com/jogamp/opengl/util/caps/** com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/av/* com/jogamp/opengl/util/packrect/** com/jogamp/opengl/util/PNG* com/jogamp/opengl/util/stereo/** jogamp/opengl/util/av/** jogamp/opengl/util/jpeg/** jogamp/opengl/util/pngj/** jogamp/opengl/util/stereo/**"/> <property name="java.part.util.awt" value="com/jogamp/opengl/util/**/awt/**"/> diff --git a/src/jogl/classes/com/jogamp/opengl/util/caps/NonFSAAGLCapabilitiesChooser.java b/src/jogl/classes/com/jogamp/opengl/util/caps/NonFSAAGLCapabilitiesChooser.java new file mode 100644 index 000000000..27d04e8b9 --- /dev/null +++ b/src/jogl/classes/com/jogamp/opengl/util/caps/NonFSAAGLCapabilitiesChooser.java @@ -0,0 +1,73 @@ +/** + * Copyright 2023 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.util.caps; + +import java.util.ArrayList; +import java.util.List; + +import com.jogamp.nativewindow.CapabilitiesImmutable; +import com.jogamp.opengl.DefaultGLCapabilitiesChooser; +import com.jogamp.opengl.GLCapabilitiesImmutable; +import com.jogamp.opengl.GLCapabilitiesChooser; + +/** + * Custom {@link GLCapabilitiesChooser}, filtering out all full screen anti-aliasing (FSAA, multisample) capabilities, + * i.e. all matching {@link GLCapabilitiesImmutable} with {@link GLCapabilitiesImmutable#getSampleBuffers()}. + */ +public class NonFSAAGLCapabilitiesChooser extends DefaultGLCapabilitiesChooser { + @Override + public int chooseCapabilities(final CapabilitiesImmutable desired, + final List<? extends CapabilitiesImmutable> available, + int recommendedIdx) { + final GLCapabilitiesImmutable recommended; + if( 0 <= recommendedIdx && recommendedIdx < available.size() ) { + recommended = (GLCapabilitiesImmutable) available.get(recommendedIdx); + } else { + recommended = null; + recommendedIdx = -1; + } + final List<GLCapabilitiesImmutable> clean = new ArrayList<GLCapabilitiesImmutable>(); + for (int i = 0; i < available.size(); i++) { + final GLCapabilitiesImmutable caps = (GLCapabilitiesImmutable) available.get(i); + if ( caps.getSampleBuffers() ) { + /** if( caps.equals(recommended) ) { // the matching index is enough! + System.err.println("Dropping["+i+"] "+caps+", matched recommended["+recommendedIdx+"] = "+recommended); + recommendedIdx = -1; + } else */ if( recommendedIdx == i ) { + System.err.println("Dropping["+i+"] "+caps+", sameidx recommended["+recommendedIdx+"] = "+recommended); + recommendedIdx = -1; + } else { + System.err.println("Dropping "+caps+" != recommended["+recommendedIdx+"]"); + } + } else { + clean.add(caps); + } + } + return super.chooseCapabilities(desired, clean, recommendedIdx); + } +} 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); } + } |