summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xmake/scripts/tests-win.bat5
-rw-r--r--make/scripts/tests.sh5
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/perf/TestPerf001GLJPanelInit01AWT.java (renamed from src/test/com/jogamp/opengl/test/junit/jogl/perf/TestPerfGLJPanel01AWT.java)6
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/perf/TestPerf001GLJPanelInit02AWT.java (renamed from src/test/com/jogamp/opengl/test/junit/jogl/perf/TestPerfGLJPanel02AWT.java)6
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/perf/TestPerf001RawInit00NEWT.java233
5 files changed, 245 insertions, 10 deletions
diff --git a/make/scripts/tests-win.bat b/make/scripts/tests-win.bat
index 5aad3a54d..6550c45eb 100755
--- a/make/scripts/tests-win.bat
+++ b/make/scripts/tests-win.bat
@@ -75,8 +75,9 @@ REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.tile.TestTiledPrintin
REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.tile.TestTiledPrintingGearsNewtAWT %*
REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.tile.TestTiledPrintingNIOImageSwingAWT %*
-scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.perf.TestPerfGLJPanel01AWT %*
-REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.perf.TestPerfGLJPanel02AWT %*
+scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.perf.TestPerf001RawInit00NEWT %*
+REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.perf.TestPerf001GLJPanelInit01AWT %*
+REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.perf.TestPerf001GLJPanelInit02AWT %*
REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.gl2.newt.TestGearsNewtAWTWrapper %*
REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.gl2.newt.TestGearsNEWT -time 30000
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index d50dd91f9..69ad8c2aa 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -334,8 +334,9 @@ function testawtswt() {
#
# performance tests
#
-testawt com.jogamp.opengl.test.junit.jogl.perf.TestPerfGLJPanel01AWT $*
-#testawt com.jogamp.opengl.test.junit.jogl.perf.TestPerfGLJPanel02AWT $*
+testawt com.jogamp.opengl.test.junit.jogl.perf.TestPerf001RawInit00NEWT $*
+#testawt com.jogamp.opengl.test.junit.jogl.perf.TestPerf001GLJPanelInit01AWT $*
+#testawt com.jogamp.opengl.test.junit.jogl.perf.TestPerf001GLJPanelInit02AWT $*
#
# tile rendring / printing w/ & w/o AWT
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/perf/TestPerfGLJPanel01AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/perf/TestPerf001GLJPanelInit01AWT.java
index 65b2914fb..d47058857 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/perf/TestPerfGLJPanel01AWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/perf/TestPerf001GLJPanelInit01AWT.java
@@ -58,7 +58,7 @@ import com.jogamp.opengl.util.Animator;
* Multiple GLJPanels in a JFrame's Grid
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class TestPerfGLJPanel01AWT extends UITestCase {
+public class TestPerf001GLJPanelInit01AWT extends UITestCase {
@BeforeClass
public static void initClass() {
@@ -229,10 +229,10 @@ public class TestPerfGLJPanel01AWT extends UITestCase {
}
if( manual ) {
GLProfile.initSingleton();
- TestPerfGLJPanel01AWT demo = new TestPerfGLJPanel01AWT();
+ TestPerf001GLJPanelInit01AWT demo = new TestPerf001GLJPanelInit01AWT();
demo.test(useGears, width, height, rows, cols, useGLJPanel, false /*useAnim*/);
} else {
- org.junit.runner.JUnitCore.main(TestPerfGLJPanel01AWT.class.getName());
+ org.junit.runner.JUnitCore.main(TestPerf001GLJPanelInit01AWT.class.getName());
}
}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/perf/TestPerfGLJPanel02AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/perf/TestPerf001GLJPanelInit02AWT.java
index f1c56309b..3988b8054 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/perf/TestPerfGLJPanel02AWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/perf/TestPerf001GLJPanelInit02AWT.java
@@ -58,7 +58,7 @@ import com.jogamp.opengl.util.Animator;
* Multiple GLJPanels in a JFrame
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class TestPerfGLJPanel02AWT extends UITestCase {
+public class TestPerf001GLJPanelInit02AWT extends UITestCase {
@BeforeClass
public static void initClass() {
@@ -229,10 +229,10 @@ public class TestPerfGLJPanel02AWT extends UITestCase {
}
if( manual ) {
GLProfile.initSingleton();
- TestPerfGLJPanel02AWT demo = new TestPerfGLJPanel02AWT();
+ TestPerf001GLJPanelInit02AWT demo = new TestPerf001GLJPanelInit02AWT();
demo.test(useGears, width, height, frameCount, useGLJPanel, false /*useAnim*/);
} else {
- org.junit.runner.JUnitCore.main(TestPerfGLJPanel02AWT.class.getName());
+ org.junit.runner.JUnitCore.main(TestPerf001GLJPanelInit02AWT.class.getName());
}
}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/perf/TestPerf001RawInit00NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/perf/TestPerf001RawInit00NEWT.java
new file mode 100644
index 000000000..772ab3107
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/perf/TestPerf001RawInit00NEWT.java
@@ -0,0 +1,233 @@
+/**
+ * Copyright 2013 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.perf;
+
+import java.lang.reflect.InvocationTargetException;
+
+import javax.media.nativewindow.AbstractGraphicsConfiguration;
+import javax.media.nativewindow.GraphicsConfigurationFactory;
+import javax.media.nativewindow.VisualIDHolder;
+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.BeforeClass;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+import com.jogamp.common.os.Platform;
+import com.jogamp.newt.Display;
+import com.jogamp.newt.NewtFactory;
+import com.jogamp.newt.Screen;
+import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.UITestCase;
+
+/**
+ * Raw initialization of multiple offscreen GLAutoDrawables
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestPerf001RawInit00NEWT extends UITestCase {
+
+ @BeforeClass
+ public static void initClass() {
+ GLProfile.initSingleton();
+ }
+
+ public void testChooseOnly(final int runNum, final Screen screen, final int count) throws InterruptedException {
+ final long[] t = new long[10];
+ final GLProfile glp = GLProfile.getGL2ES2();
+ final int[] chosenCfgs = { 0 };
+
+ final GLCapabilitiesImmutable caps = new GLCapabilities(glp);
+ final GraphicsConfigurationFactory factory = GraphicsConfigurationFactory.getFactory(screen.getDisplay().getGraphicsDevice(), caps);
+
+ if( wait && 1 == runNum ) {
+ UITestCase.waitForKey("Pre-Init");
+ }
+ System.err.println("INIT START #"+runNum);
+ screen.getDisplay().getEDTUtil().invoke(true, new Runnable() {
+ public void run() {
+ t[0] = Platform.currentTimeMillis();
+ for(int i=0; i<count; i++) {
+ final AbstractGraphicsConfiguration cfg = factory.chooseGraphicsConfiguration(caps, caps, null, screen.getGraphicsScreen(), VisualIDHolder.VID_UNDEFINED);
+ if( null != cfg ) {
+ chosenCfgs[0]++;
+ }
+ }
+ t[1] = Platform.currentTimeMillis();
+ } } );
+
+ final double countF = count;
+ System.err.printf("Run: %d, count %d/%d raw:%n\tchoose\t%6d/t %6.2f/1%n",
+ runNum, chosenCfgs[0], count, t[1]-t[0], (t[1]-t[0])/countF);
+ System.err.println("INIT END #"+runNum);
+ if( wait && 2 == runNum ) {
+ UITestCase.waitForKey("Post-Init");
+ }
+ }
+
+ public void testFull(final int runNum, final int width, final int height, final int count) {
+ // panel.setBounds(0, 0, width, height);
+ final long[] t = new long[10];
+ final GLDrawable[] glDrawables = new GLDrawable[count];
+ final GLContext[] glConti = new GLContext[count];
+ final GLProfile glp = GLProfile.getGL2ES2();
+ final GLCapabilitiesImmutable caps = new GLCapabilities(glp);
+ final GLDrawableFactory factory = GLDrawableFactory.getFactory(glp);
+ if( wait && 1 == runNum ) {
+ UITestCase.waitForKey("Pre-Init");
+ }
+ System.err.println("INIT START #"+runNum);
+ t[0] = Platform.currentTimeMillis();
+ for(int i=0; i<count; i++) {
+ glDrawables[i] = factory.createOffscreenDrawable(null, caps, null, width, height);
+ }
+ t[1] = Platform.currentTimeMillis();
+ for(int i=0; i<count; i++) {
+ glDrawables[i].setRealized(true);
+ }
+ t[2] = Platform.currentTimeMillis();
+ // 1st makeCurrent - context creation incl. release
+ for(int i=0; i<count; i++) {
+ final GLContext context = glDrawables[i].createContext(null);
+ if( GLContext.CONTEXT_NOT_CURRENT >= context.makeCurrent() ) {
+ // oops
+ glDrawables[i].setRealized(false);
+ glDrawables[i] = null;
+ glConti[i] = null;
+ continue;
+ }
+ glConti[i] = context;
+ context.release();
+ }
+ t[3] = Platform.currentTimeMillis();
+ // 2nd makeCurrent and release
+ for(int i=0; i<count; i++) {
+ final GLContext context = glConti[i];
+ if( GLContext.CONTEXT_NOT_CURRENT >= context.makeCurrent() ) {
+ // oops
+ glDrawables[i].setRealized(false);
+ glDrawables[i] = null;
+ glConti[i] = null;
+ continue;
+ }
+ context.release();
+ }
+ t[4] = Platform.currentTimeMillis();
+
+ final double countF = count;
+ System.err.printf("Run: %d, count %d raw:%n\tglad-create\t%6d/t %6.2f/1%n"+
+ "\tglad-realize\t%6d/t %6.2f/1%n"+
+ "\tctx-create1\t%6d/t %6.2f/1%n"+
+ "\tctx-curren2\t%6d/t %6.2f/1%n"+
+ "\tglad-ctx-init\t%6d/t %6.2f/1%n",
+ runNum, count,
+ t[1]-t[0], (t[1]-t[0])/countF, // create
+ t[2]-t[1], (t[2]-t[1])/countF, // realize
+ t[3]-t[2], (t[3]-t[2])/countF, // context-create1
+ t[4]-t[3], (t[4]-t[3])/countF, // context-curren2
+ t[3]-t[0], (t[3]-t[0])/countF);// init total
+ System.err.println("INIT END #"+runNum);
+ if( wait && 2 == runNum ) {
+ UITestCase.waitForKey("Post-Init");
+ }
+
+ // destroy
+ for(int i=0; i<count; i++) {
+ final GLContext context = glConti[i];
+ if( null != context ) {
+ context.destroy();
+ }
+ final GLDrawable glDrawable = glDrawables[i];
+ if( null != glDrawable ) {
+ glDrawable.setRealized(false);
+ }
+ glConti[i] = null;
+ glDrawables[i] = null;
+ }
+ }
+
+ @Test
+ public void test01ChooseOnly() throws InterruptedException, InvocationTargetException {
+ if( 0 != manualTest && 1 != manualTest ) {
+ return;
+ }
+ final int count = 50;
+ final Display display = NewtFactory.createDisplay(null, false);
+ final Screen screen = NewtFactory.createScreen(display, 0);
+ screen.addReference();
+ try {
+ testChooseOnly(0, screen, count); // warm-up
+ testChooseOnly(1, screen, count);
+ testChooseOnly(2, screen, count);
+ } finally {
+ screen.removeReference();
+ }
+ }
+
+ @Test
+ public void test02Full() throws InterruptedException, InvocationTargetException {
+ if( 0 != manualTest && 2 != manualTest ) {
+ return;
+ }
+ final int width = 800, height = 600, count = 50;
+ testFull(0, width, height, count); // warm-up
+ testFull(1, width, height, count);
+ testFull(2, width, height, count);
+ }
+
+ static boolean wait = false;
+ static int manualTest = 0;
+
+ public static void main(String[] args) {
+ int width = 800, height = 600, count = 50;
+
+ for(int i=0; i<args.length; i++) {
+ if(args[i].equals("-width")) {
+ width = MiscUtils.atoi(args[++i], width);
+ } else if(args[i].equals("-height")) {
+ height = MiscUtils.atoi(args[++i], height);
+ } else if(args[i].equals("-count")) {
+ count = MiscUtils.atoi(args[++i], count);
+ } else if(args[i].equals("-wait")) {
+ wait = true;
+ } else if(args[i].equals("-test")) {
+ manualTest = MiscUtils.atoi(args[++i], manualTest);
+ }
+ }
+ if( wait ) {
+ UITestCase.waitForKey("Main");
+ }
+ org.junit.runner.JUnitCore.main(TestPerf001RawInit00NEWT.class.getName());
+ }
+
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 11:38:42 +0000