aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/build-common.xml15
-rw-r--r--make/build-jogl.xml4
-rw-r--r--make/build-oculusvr.xml38
-rw-r--r--make/build-test.xml26
-rw-r--r--make/build.xml31
-rw-r--r--make/config/jogl/glu-CustomJavaCode-base.java9
-rw-r--r--make/config/jogl/glu-CustomJavaCode-gl2.java10
-rw-r--r--make/config/jogl/glu-CustomJavaCode-gl2es1.java2
-rwxr-xr-xmake/scripts/make.jogl.all.linux-x86_64.sh1
-rwxr-xr-xmake/scripts/setenv-jogl.sh3
-rw-r--r--make/scripts/tests.sh30
11 files changed, 118 insertions, 51 deletions
diff --git a/make/build-common.xml b/make/build-common.xml
index c508e1706..d0eb515e8 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -513,6 +513,20 @@
<path refid="nativewindow_all_atoms.classpath" />
<path refid="jogl_all_atoms.classpath" />
<path refid="newt_all_atoms.classpath" />
+ </path>
+
+ <path id="junit_jogl_newt_oculusvr.compile.classpath">
+ <pathelement location="${junit.jar}" />
+ <pathelement location="${ant.jar}" />
+ <pathelement location="${ant-junit.jar}" />
+ <pathelement location="${ant-junit4.jar}" />
+ <pathelement location="${semver.jar}" />
+ <pathelement location="${gluegen-rt.jar}" />
+ <pathelement location="${gluegen-test-util.jar}" />
+ <pathelement location="${swt.jar}" />
+ <path refid="nativewindow_all_atoms.classpath" />
+ <path refid="jogl_all_atoms.classpath" />
+ <path refid="newt_all_atoms.classpath" />
<path refid="oculusvr_all_atoms.classpath"/>
</path>
@@ -538,6 +552,7 @@
<pathelement location="${gluegen-rt.jar}" />
<pathelement location="${swt.jar}" />
<pathelement location="${jogl-all.jar}" />
+ <pathelement location="${oculusvr.jar}" />
</path>
<!-- Test Run w/ AWT .. -->
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 9e56cd1e1..b0162d9aa 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -93,7 +93,7 @@
<property name="java.part.core"
value="${java.part.gluegen-gl-rt} javax/media/opengl/* javax/media/opengl/fixedfunc/* com/jogamp/opengl/* com/jogamp/opengl/math/** jogamp/opengl/* ${java.part.core.util}"/>
- <property name="java.part.core.exclude" value="javax/media/opengl/Debug* javax/media/opengl/Trace* com/jogamp/opengl/util/AWTAnimatorImpl*"/>
+ <property name="java.part.core.exclude" value="javax/media/opengl/Debug* javax/media/opengl/Trace* com/jogamp/opengl/util/AWTAnimatorImpl* com/jogamp/opengl/util/PNG*"/>
<property name="java.part.nv-cg"
value="com/jogamp/opengl/cg com/jogamp/opengl/cg/* jogamp/opengl/cg/*"/>
@@ -153,7 +153,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/** jogamp/opengl/util/av/** jogamp/opengl/util/jpeg/** jogamp/opengl/util/pngj/**"/>
+ value="com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/av/* com/jogamp/opengl/util/stereo/* com/jogamp/opengl/util/packrect/** com/jogamp/opengl/util/PNG* jogamp/opengl/util/av/** jogamp/opengl/util/jpeg/** jogamp/opengl/util/pngj/**"/>
<property name="java.part.util.awt"
value="com/jogamp/opengl/util/**/awt/**"/>
diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml
index c9370c547..15ed6bde4 100644
--- a/make/build-oculusvr.xml
+++ b/make/build-oculusvr.xml
@@ -16,9 +16,15 @@
-->
<target name="partitioning.setup" depends="common.init">
<property name="java.part.oculusvr"
- value="com/jogamp/oculusvr/* jogamp/oculusvr/*"/>
+ value="com/jogamp/oculusvr/**"/>
+ <property name="java.part.opengl.oculusvr"
+ value="com/jogamp/opengl/oculusvr/** jogamp/opengl/oculusvr/**"/>
<property name="java.part.oculusvr.exclude"
- value="com/jogamp/oculusvr/renderer/*" />
+ value="" />
+ <property name="java.part.oculusvr.shadercode"
+ value="jogamp/opengl/oculusvr/shader/**"/>
+ <property name="java.part.nonjava"
+ value="${java.part.oculusvr.shadercode}"/>
</target>
<!-- ================================================================== -->
@@ -127,7 +133,7 @@
<!-- Now check for the presence of one well-known file -->
<uptodate property="java.generate.skip.ovr"
- targetfile="${src.generated.java}/com/jogamp/oculusvr/OVR.java">
+ targetfile="${src.generated.java}/com/jogamp/opengl/oculusvr/OVR.java">
<srcfiles refid="stub.includes.dependencies.fileset.1" />
<srcfiles refid="stub.includes.dependencies.fileset.2" />
<srcfiles refid="stub.includes.dependencies.fileset.3" />
@@ -161,7 +167,22 @@
<!-- ================================================================== -->
<target name="java.compile" depends="java.generate">
- <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
+ <!-- Pure non JOGL OculusVR part -->
+ <javac destdir="${classes}"
+ excludes="${java.part.oculusvr.exclude} ${java.part.opengl.oculusvr}"
+ fork="yes"
+ includeAntRuntime="false"
+ memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
+ source="${target.sourcelevel}"
+ target="${target.targetlevel}"
+ bootclasspath="${target.rt.jar}"
+ debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+ <classpath refid="nativewindow_gluegen.classpath"/>
+ <src path="${src.java}" />
+ <src path="${src.generated.java}" />
+ </javac>
+ <!-- Add JOGL OculusVR part -->
<javac destdir="${classes}"
excludes="${java.part.oculusvr.exclude}"
fork="yes"
@@ -172,11 +193,16 @@
target="${target.targetlevel}"
bootclasspath="${target.rt.jar}"
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
- <!-- classpath refid="nativewindow_gluegen.classpath"/ -->
<classpath refid="jogl_nativewindow_gluegen.classpath"/>
<src path="${src.java}" />
<src path="${src.generated.java}" />
</javac>
+ <!-- make shadercode and fonts available in classpath -->
+ <copy todir="${classes}">
+ <fileset dir="${src.java}"
+ includes="${java.part.nonjava}"
+ excludes="**/*.java"/>
+ </copy>
</target>
<!-- ================================================================== -->
@@ -616,7 +642,7 @@
<target name="build-jars-javase" depends="setup-manifestfile">
<jar manifest="${build.oculusvr}/manifest.mf" destfile="${build.oculusvr}/oculusvr.jar" filesonly="true">
<fileset dir="${classes}"
- includes="${java.part.oculusvr}"
+ includes="${java.part.oculusvr} ${java.part.opengl.oculusvr}"
excludes="${java.part.oculusvr.exclude}"/>
</jar>
<jar manifest="${build.oculusvr}/manifest.mf" destfile="${build.oculusvr}/oculusvr-natives-${os.and.arch}.jar" filesonly="true">
diff --git a/make/build-test.xml b/make/build-test.xml
index 10c00c865..88d40bc39 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -28,6 +28,7 @@
<property name="java.part.test.all" value="com/jogamp/** jogamp/**"/>
<property name="java.part.test.android" value="com/jogamp/opengl/test/android/**"/>
+ <property name="java.part.test.oculusvr" value="com/jogamp/opengl/test/junit/jogl/stereo/ovr/**"/>
<property name="java.dir.test" value="com/jogamp/opengl/test"/>
<property name="java.dir.junit" value="${java.dir.test}/junit"/>
<property name="java.dir.bugs" value="${java.dir.test}/bugs"/>
@@ -62,10 +63,10 @@
<!--
- Build/run tests/junit.
-->
- <target name="test.compile.javase">
- <!-- Perform the junit pass Java SE compile -->
+
+ <target name="test.compile.javase.generic">
<javac destdir="${classes}"
- excludes="${java.part.test.android}"
+ excludes="${java.part.test.android} ${java.part.test.oculusvr}"
fork="yes"
includeAntRuntime="false"
memoryMaximumSize="${javac.memorymax}"
@@ -77,6 +78,24 @@
<classpath refid="junit_jogl_newt.compile.classpath"/>
<src path="${src.test}" />
</javac>
+ </target>
+ <target name="test.compile.javase.oculusvr" if="oculusvr.sdk.available">
+ <javac destdir="${classes}"
+ includes="${java.part.test.oculusvr}"
+ excludes="${java.part.test.android}"
+ fork="yes"
+ includeAntRuntime="false"
+ memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
+ source="${target.sourcelevel}"
+ target="${target.targetlevel}"
+ bootclasspath="${target.rt.jar}"
+ debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+ <classpath refid="junit_jogl_newt_oculusvr.compile.classpath"/>
+ <src path="${src.test}" />
+ </javac>
+ </target>
+ <target name="test.compile.javase" depends="test.compile.javase.generic, test.compile.javase.oculusvr">
<copy file="joglversion-test"
tofile="${build.test}/manifest-test.mf"
overwrite="true">
@@ -104,6 +123,7 @@
<target name="test.compile.android" if="android-jars.available">
<!-- Perform the junit pass Java Android compile -->
<javac destdir="${classes}"
+ excludes="${java.part.test.oculusvr}"
fork="yes"
includeAntRuntime="false"
memoryMaximumSize="${javac.memorymax}"
diff --git a/make/build.xml b/make/build.xml
index 9e42234f7..50a0cfc28 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -166,24 +166,10 @@
<exclude name="*jogl_cg.${native.library.suffix}" />
</fileset>
</jar>
- <jar manifest="${build}/manifest-all.mf" destfile="${jar}/jogl-all-noawt-natives-${os.and.arch}.jar" filesonly="true">
- <fileset dir="${lib}">
- <include name="*.${native.library.suffix}" />
- <exclude name="*jogl_cg.${native.library.suffix}" />
- </fileset>
- </jar>
- <jar manifest="${build}/manifest-all.mf" destfile="${jar}/jogl-all-mobile-natives-${os.and.arch}.jar" filesonly="true">
- <fileset dir="${lib}">
- <include name="*.${native.library.suffix}" />
- <exclude name="*jogl_cg.${native.library.suffix}" />
- </fileset>
- </jar>
- <jar manifest="${build}/manifest-all.mf" destfile="${jar}/jogl-all-android-natives-${os.and.arch}.jar" filesonly="true">
- <fileset dir="${lib}">
- <include name="*.${native.library.suffix}" />
- <exclude name="*jogl_cg.${native.library.suffix}" />
- </fileset>
- </jar>
+ <!-- Produce duplicates for diff 'all' configuration, since non-native-jar aliasing (Bug 1023/Bug 1024) -->
+ <copy file="${jar}/jogl-all-natives-${os.and.arch}.jar" tofile="${jar}/jogl-all-noawt-natives-${os.and.arch}.jar" />
+ <copy file="${jar}/jogl-all-natives-${os.and.arch}.jar" tofile="${jar}/jogl-all-mobile-natives-${os.and.arch}.jar" />
+ <copy file="${jar}/jogl-all-natives-${os.and.arch}.jar" tofile="${jar}/jogl-all-android-natives-${os.and.arch}.jar" />
</target>
<target name="android.package.jogl.skip.check" depends="init,gluegen.cpptasks.detect.os">
@@ -265,12 +251,18 @@
<!--delete includeEmptyDirs="true" quiet="true" failonerror="false">
<fileset dir="${build}" includes="jogl-java-src.zip" />
</delete-->
+ <mkdir dir="${build}/oculusvr/gensrc/classes"/> <!-- just in case it was _not_ build -->
<zip destfile="${build}/jogl-java-src.zip" level="0">
<fileset dir="${src}/nativewindow/classes"/>
<fileset dir="${build}/nativewindow/gensrc/classes"/>
<fileset dir="${src}/jogl/classes"/>
<fileset dir="${build}/jogl/gensrc/classes"/>
<fileset dir="${src}/newt/classes"/>
+ <fileset dir="${src}/oculusvr/classes"/>
+ <fileset dir="${build}/oculusvr/gensrc/classes"/>
+ </zip>
+ <zip destfile="${build}/jogl-test-java-src.zip" level="0">
+ <fileset dir="${src}/test"/>
</zip>
</target>
@@ -312,6 +304,7 @@
<copy todir="${archive}">
<fileset dir="${build}">
<include name="jogl-java-src.zip"/>
+ <include name="jogl-test-java-src.zip"/>
</fileset>
</copy>
<archive.7z destfile="${build}/${archive.name}.7z"
@@ -397,7 +390,7 @@
<property name="javadoc.spec.packagenames" value="javax.media.opengl.*" />
<property name="javadoc.windowtitle" value="JOGL, NativeWindow and NEWT APIs" />
- <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames}, ${javadoc.spec.packagenames}, com.jogamp.opengl.*, com.jogamp.nativewindow.*, com.jogamp.newt.*" />
+ <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames}, ${javadoc.spec.packagenames}, com.jogamp.opengl.*, com.jogamp.nativewindow.*, com.jogamp.newt.* com.jogamp.oculusvr.*" />
<property name="javadoc.dev.packagenames" value="${javadoc.packagenames}, com.jogamp.opengl.*, com.jogamp.nativewindow.*, com.jogamp.newt.*, com.jogamp.gluegen.opengl.*, com.jogamp.gluegen.runtime.opengl.*, jogamp.nativewindow.*, jogamp.opengl.*, jogamp.newt.*" />
diff --git a/make/config/jogl/glu-CustomJavaCode-base.java b/make/config/jogl/glu-CustomJavaCode-base.java
index 2401e9c94..606583acf 100644
--- a/make/config/jogl/glu-CustomJavaCode-base.java
+++ b/make/config/jogl/glu-CustomJavaCode-base.java
@@ -128,14 +128,11 @@ public static final GLU createGLU(GL gl) throws GLException {
public GLU()
{
- this.project = new ProjectFloat();
+ project = new ProjectFloat();
}
+/** @deprecated No more used, NOP */
public void destroy() {
- if(null!=this.project) {
- this.project.destroy();
- this.project=null;
- }
}
public static final GL getCurrentGL() throws GLException {
@@ -1315,7 +1312,7 @@ public final void gluSphere(GLUquadric quad, double radius, int slices, int stac
// Projection routines
//
-private ProjectFloat project;
+private final ProjectFloat project;
public void gluOrtho2D(float left, float right, float bottom, float top) {
project.gluOrtho2D(getCurrentGL().getGL2ES1(), left, right, bottom, top);
diff --git a/make/config/jogl/glu-CustomJavaCode-gl2.java b/make/config/jogl/glu-CustomJavaCode-gl2.java
index 3ccf6c1d4..b416d53f9 100644
--- a/make/config/jogl/glu-CustomJavaCode-gl2.java
+++ b/make/config/jogl/glu-CustomJavaCode-gl2.java
@@ -35,14 +35,12 @@ static {
public GLUgl2()
{
- this.project = new ProjectDouble();
+ project = new ProjectDouble();
}
+/** @deprecated No more used, NOP */
+@Override
public void destroy() {
- if(null!=this.project) {
- this.project.destroy();
- this.project=null;
- }
super.destroy();
}
@@ -136,7 +134,7 @@ public final boolean isFunctionAvailable(String gluFunctionName)
// Projection routines
//
-private ProjectDouble project;
+private final ProjectDouble project;
public final void gluOrtho2D(float left, float right, float bottom, float top) {
project.gluOrtho2D(getCurrentGL2(), (double)left, (double)right, (double)bottom, (double)top);
diff --git a/make/config/jogl/glu-CustomJavaCode-gl2es1.java b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
index a1f689f42..ad242be21 100644
--- a/make/config/jogl/glu-CustomJavaCode-gl2es1.java
+++ b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
@@ -40,6 +40,8 @@ public GLUgl2es1()
super();
}
+/** @deprecated No more used, NOP */
+@Override
public void destroy() {
super.destroy();
}
diff --git a/make/scripts/make.jogl.all.linux-x86_64.sh b/make/scripts/make.jogl.all.linux-x86_64.sh
index 2488a7d4c..9e8d52980 100755
--- a/make/scripts/make.jogl.all.linux-x86_64.sh
+++ b/make/scripts/make.jogl.all.linux-x86_64.sh
@@ -18,6 +18,7 @@ if [ "$1" = "-libdir" ] ; then
fi
# -Dc.compiler.debug=true \
+# -Djavacdebuglevel="source,lines,vars" \
# -Dgluegen.cpptasks.detected.os=true \
# -DisUnix=true \
diff --git a/make/scripts/setenv-jogl.sh b/make/scripts/setenv-jogl.sh
index 1a8106e6c..bbaf5187c 100755
--- a/make/scripts/setenv-jogl.sh
+++ b/make/scripts/setenv-jogl.sh
@@ -110,9 +110,10 @@ LIB=$THISDIR/lib
JOGAMP_ALL_AWT_CLASSPATH=.:"$GLUEGEN_JAR":"$JOAL_JAR":"$JOGL_ALL_AWT_CLASSPATH":"$SWT_CLASSPATH":"$JUNIT_JAR":"$ANT_JARS":"$SEMVER_JAR":"$GLUEGEN_TESTUTIL_JAR"
JOGAMP_ALL_NOAWT_CLASSPATH=.:"$GLUEGEN_JAR":"$JOAL_JAR":"$JOGL_ALL_NOAWT_CLASSPATH":"$SWT_CLASSPATH":"$JUNIT_JAR":"$ANT_JARS":"$SEMVER_JAR":"$GLUEGEN_TESTUTIL_JAR"
JOGAMP_MOBILE_CLASSPATH=.:"$GLUEGEN_JAR":"$JOAL_JAR":"$JOGL_MOBILE_CLASSPATH":"$SWT_CLASSPATH":"$JUNIT_JAR":"$ANT_JARS":"$SEMVER_JAR":"$GLUEGEN_TESTUTIL_JAR"
+JOGAMP_ATOMICS_NOAWT_CLASSPATH=.:"$GLUEGEN_JAR":"$JOAL_JAR":"$JOGL_ATOMICS_NOAWT_CLASSPATH":"$SWT_CLASSPATH":"$JUNIT_JAR":"$ANT_JARS":"$SEMVER_JAR":"$GLUEGEN_TESTUTIL_JAR"
JOGAMP_ALL_NOAWT_ALT_CLASSPATH=.:"$GLUEGEN_ALT_JAR":"$JOAL_JAR":"$JOGL_ALL_NOAWT_CLASSPATH":"$SWT_CLASSPATH":"$JUNIT_JAR":"$ANT_JARS":"$SEMVER_JAR":"$GLUEGEN_TESTUTIL_JAR"
JOGAMP_MOBILE_ALT_CLASSPATH=.:"$GLUEGEN_ALT_JAR":"$JOAL_JAR":"$JOGL_MOBILE_CLASSPATH":"$SWT_CLASSPATH":"$JUNIT_JAR":"$ANT_JARS":"$SEMVER_JAR":"$GLUEGEN_TESTUTIL_JAR"
-export JOGAMP_ALL_AWT_CLASSPATH JOGAMP_ALL_NOAWT_CLASSPATH JOGAMP_MOBILE_CLASSPATH JOGAMP_ALL_NOAWT_ALT_CLASSPATH JOGAMP_MOBILE_ALT_CLASSPATH
+export JOGAMP_ALL_AWT_CLASSPATH JOGAMP_ALL_NOAWT_CLASSPATH JOGAMP_MOBILE_CLASSPATH JOGAMP_ATOMICS_NOAWT_CLASSPATH JOGAMP_ALL_NOAWT_ALT_CLASSPATH JOGAMP_MOBILE_ALT_CLASSPATH
CLASSPATH=.:"$GLUEGEN_JAR":"$JOAL_JAR":"$JOGL_CLASSPATH":"$SWT_CLASSPATH":"$JUNIT_JAR":"$ANT_JARS":"$SEMVER_JAR":"$GLUEGEN_TESTUTIL_JAR"
export CLASSPATH
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 173f397af..438c736d6 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -124,6 +124,7 @@ function jrun() {
#D_ARGS="-Djogl.debug.GLBufferObjectTracker"
#D_ARGS="-Djogl.debug.GLBufferObjectTracker -Djogl.debug.GLArrayData -Djogl.debug.TraceGL -Djogl.debug.DebugGL"
#D_ARGS="-Djogl.debug.GLSLCode"
+ #D_ARGS="-Djogl.debug.GLSLCode -Djogl.debug.TraceGL"
#D_ARGS="-Djogl.debug.GLSLCode -Djogl.debug.DebugGL"
#D_ARGS="-Djogl.debug.GLContext -Dnativewindow.debug.JAWT -Dnewt.debug.Window"
#D_ARGS="-Dnativewindow.debug.JAWT -Djogl.debug.GLCanvas"
@@ -275,6 +276,7 @@ function jrun() {
#D_ARGS="-Djogl.debug.GLMediaPlayer -Djogl.debug.GLSLCode"
#D_ARGS="-Djogl.debug.GLMediaPlayer.StreamWorker.delay=25 -Djogl.debug.GLMediaPlayer"
#D_ARGS="-Djogl.debug.GLMediaPlayer.Native"
+ #D_ARGS="-Djogl.debug.StereoDevice"
if [ $awton -eq 1 ] ; then
export USE_CLASSPATH=$JOGAMP_ALL_AWT_CLASSPATH
@@ -284,12 +286,12 @@ function jrun() {
export USE_CLASSPATH=$JOGAMP_ALL_AWT_CLASSPATH
echo USE_CLASSPATH $USE_CLASSPATH
X_ARGS="-Djava.awt.headless=true $X_ARGS"
+ elif [ $awton -eq -1 ] ; then
+ export USE_CLASSPATH=$JOGAMP_ATOMICS_NOAWT_CLASSPATH
else
#export USE_CLASSPATH=$JOGAMP_ALL_AWT_CLASSPATH
export USE_CLASSPATH=$JOGAMP_ALL_NOAWT_CLASSPATH
#export USE_CLASSPATH=$JOGAMP_MOBILE_CLASSPATH
- #export USE_CLASSPATH=$JOGAMP_ALL_NOAWT_ALT_CLASSPATH
- #export USE_CLASSPATH=$JOGAMP_MOBILE_ALT_CLASSPATH
#export USE_CLASSPATH=.:$GLUEGEN_JAR:$JOGL_BUILD_DIR/jar/atomic/jogl.jar:$JOGL_BUILD_DIR/jar/atomic/jogl-gldesktop.jar:$JOGL_BUILD_DIR/jar/atomic/jogl-os-x11.jar:$JOGL_BUILD_DIR/jar/atomic/jogl-util.jar:$JOGL_BUILD_DIR/jar/atomic/nativewindow.jar:$JOGL_BUILD_DIR/jar/atomic/nativewindow-os-x11.jar:$JOGL_BUILD_DIR/jar/atomic/newt.jar:$JOGL_BUILD_DIR/jar/atomic/newt-driver-x11.jar:$JOGL_BUILD_DIR/jar/atomic/newt-ogl.jar:$JOGL_BUILD_DIR/jar/jogl-test.jar:$SWT_CLASSPATH:$JUNIT_JAR:$ANT_JARS
X_ARGS="-Djava.awt.headless=true $X_ARGS"
fi
@@ -327,21 +329,25 @@ function jrun() {
echo
}
+function testnoawtatomics() {
+ jrun -1 0 $* 2>&1 | tee -a java-run.log
+}
+
function testnoawt() {
- jrun 0 0 $* 2>&1 | tee -a java-run.log
+ jrun 0 0 $* 2>&1 | tee -a java-run.log
}
function testawt() {
MOSX_MT=0
- jrun 1 0 $* 2>&1 | tee -a java-run.log
+ jrun 1 0 $* 2>&1 | tee -a java-run.log
}
function testswt() {
- jrun 0 1 $* 2>&1 | tee -a java-run.log
+ jrun 0 1 $* 2>&1 | tee -a java-run.log
}
function testawtswt() {
- jrun 1 1 $* 2>&1 | tee -a java-run.log
+ jrun 1 1 $* 2>&1 | tee -a java-run.log
}
#
@@ -352,7 +358,8 @@ function testawtswt() {
#testnoawt com.jogamp.nativewindow.NativeWindowVersion $*
#testnoawt com.jogamp.opengl.JoglVersion $*
#testnoawt com.jogamp.newt.NewtVersion $*
-testnoawt com.jogamp.oculusvr.OVRVersion $*
+#testnoawt com.jogamp.oculusvr.OVRVersion $*
+
#testnoawt com.jogamp.newt.opengl.GLWindow $*
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLVersionParsing00NEWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLWindowNEWT $*
@@ -362,6 +369,11 @@ testnoawt com.jogamp.oculusvr.OVRVersion $*
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestVersionSemanticsNOUI $*
#
+# Stereo
+#
+testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $*
+
+#
# HiDPI
#
#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
@@ -389,6 +401,7 @@ testnoawt com.jogamp.oculusvr.OVRVersion $*
#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestLandscapeES2NEWT $*
#testawtswt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasSWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestElektronenMultipliziererNEWT $*
+#testnoawtatomics com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestRedSquareES2NEWT $*
#testswt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasSWT $*
@@ -435,12 +448,13 @@ testnoawt com.jogamp.oculusvr.OVRVersion $*
# CORE [NEWT + AWT] (testnoawt and testawt)
#
#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestFloatUtil01NOUI $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestFloatUtil02MatrixMatrixMultNOUI $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestFloatUtil03InversionNOUI $*
#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestPMVMatrix01NEWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestPMVMatrix02NOUI $*
#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestPMVMatrix03NOUI $*
#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestGluUnprojectFloatNOUI $*
#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestGluUnprojectDoubleNOUI $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestFloatUtil01MatrixMatrixMultNOUI $*
#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestBinary16NOUI $*
#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestQuaternion01NOUI $*
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 22:44:20 +0000