summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <sgothel@jausoft.com>2011-08-22 03:04:54 +0200
committerSven Gothel <sgothel@jausoft.com>2011-08-22 03:04:54 +0200
commit62df9dd196b229c3c532af4a166e6888599f85bd (patch)
tree9adff801f21bbae398fdbdca09c1e7c7ad62372f
parentd09063b4044ca82a805f91af550a9b9d7e7eef2a (diff)
NewtVersionActivity: Remove 'gears' test; Version Info: Drop NativeWindow/Newt Version since we use *all* targets
-rw-r--r--make/scripts/crosstest-java-linux-armv7-rel.sh6
-rwxr-xr-xmake/scripts/make.jogl.all.linux-x86_64.sh4
-rwxr-xr-xmake/scripts/tests.sh10
-rw-r--r--src/jogl/classes/com/jogamp/opengl/JoglVersion.java2
-rw-r--r--src/jogl/classes/javax/media/opengl/awt/GLCanvas.java2
-rw-r--r--src/newt/classes/com/jogamp/newt/opengl/GLWindow.java2
-rw-r--r--src/newt/classes/jogamp/newt/driver/android/NewtVersionActivity.java30
-rw-r--r--src/newt/classes/jogamp/newt/driver/awt/opengl/VersionApplet.java6
8 files changed, 31 insertions, 31 deletions
diff --git a/make/scripts/crosstest-java-linux-armv7-rel.sh b/make/scripts/crosstest-java-linux-armv7-rel.sh
index c274dab..bf5a315 100644
--- a/make/scripts/crosstest-java-linux-armv7-rel.sh
+++ b/make/scripts/crosstest-java-linux-armv7-rel.sh
@@ -1,5 +1,6 @@
export HOST_UID=sven
export HOST_IP=192.168.0.52
+#export HOST_IP=192.168.1.5
export HOST_RSYNC_ROOT=PROJECTS/JOGL
export TARGET_UID=jogamp
@@ -13,7 +14,7 @@ export ANT_PATH=/usr/share/ant
#TSTCLASS=com.jogamp.nativewindow.NativeWindowVersion
#TSTCLASS=com.jogamp.opengl.JoglVersion
-TSTCLASS=com.jogamp.newt.NewtVersion
+#TSTCLASS=com.jogamp.newt.NewtVersion
#TSTCLASS=com.jogamp.newt.opengl.GLWindow
#TSTCLASS=com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen01GLPBufferNEWT
#TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLSimple01NEWT
@@ -22,7 +23,8 @@ TSTCLASS=com.jogamp.newt.NewtVersion
#TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01
#TSTCLASS=com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo01
#TSTCLASS=com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo02
-#TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2ES1NEWT
+#TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT
+TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.es1.newt.TestGearsES1NEWT
LOGFILE=`basename $0 .sh`.log
diff --git a/make/scripts/make.jogl.all.linux-x86_64.sh b/make/scripts/make.jogl.all.linux-x86_64.sh
index e57f0a9..3ae48f5 100755
--- a/make/scripts/make.jogl.all.linux-x86_64.sh
+++ b/make/scripts/make.jogl.all.linux-x86_64.sh
@@ -1,9 +1,5 @@
#! /bin/sh
-if [ -e ../../setenv-build-jogl-x86_64.sh ] ; then
- . ../../setenv-build-jogl-x86_64.sh
-fi
-
if [ -z "$ANT_PATH" ] ; then
if [ -e /usr/share/ant/bin/ant -a -e /usr/share/ant/lib/ant.jar ] ; then
ANT_PATH=/usr/share/ant
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 678b48b..99292ce 100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -77,7 +77,7 @@ function jrun() {
#D_ARGS="-Djogl.debug.GraphicsConfiguration"
#D_ARGS="-Djogl.debug.GLCanvas -Djogl.debug.GraphicsConfiguration"
#D_ARGS="-Djogl.debug.GLCanvas"
- #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.GLDebugMessageHandler"
+ D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.GLDebugMessageHandler -Djogl.debug.GLSLCode"
#D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.TraceGL"
#D_ARGS="-Djogl.debug.GLDebugMessageHandler -Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.debug.EDT"
#D_ARGS="-Djogl.debug.GLDebugMessageHandler"
@@ -142,7 +142,8 @@ function testawtmt() {
#testnoawt com.jogamp.opengl.test.junit.newt.TestRemoteGLWindows01NEWT $*
#testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2ES1NEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es1.newt.TestGearsES1NEWT $*
+testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
#testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindows02NEWTAnimated $*
#testawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle01NEWT
#testawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle02NEWT
@@ -175,7 +176,7 @@ function testawtmt() {
#testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug461OffscreenSupersamplingSwingAWT
#testawt com.jogamp.opengl.test.junit.jogl.texture.TestGrayTextureFromFileAWTBug417
#testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAWT01GLn $*
-testawt com.jogamp.opengl.test.junit.jogl.glu.TestBug463ScaleImageMemoryAWT $*
+#testawt com.jogamp.opengl.test.junit.jogl.glu.TestBug463ScaleImageMemoryAWT $*
#
# newt.awt (testawt)
@@ -226,8 +227,11 @@ testawt com.jogamp.opengl.test.junit.jogl.glu.TestBug463ScaleImageMemoryAWT $*
#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo02 $*
#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo01 $*
#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo02 $*
+#testnoawt com.jogamp.opengl.test.junit.graph.demos.mobile.GPUTextNewtDemoMobile01
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMapBuffer01NEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.ElektronenMultiplizierer
$spath/count-edt-start.sh java-run.log
diff --git a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
index ea70017..d162f2b 100644
--- a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
+++ b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
@@ -111,7 +111,7 @@ public class JoglVersion extends JogampVersion {
public static void main(String args[]) {
System.err.println(VersionUtil.getPlatformInfo());
System.err.println(GlueGenVersion.getInstance());
- System.err.println(NativeWindowVersion.getInstance());
+ // System.err.println(NativeWindowVersion.getInstance());
System.err.println(JoglVersion.getInstance());
}
}
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
index c14142a..d861bd7 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
@@ -1038,7 +1038,7 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable, WindowClosing
public static void main(String args[]) {
System.err.println(VersionUtil.getPlatformInfo());
System.err.println(GlueGenVersion.getInstance());
- System.err.println(NativeWindowVersion.getInstance());
+ // System.err.println(NativeWindowVersion.getInstance());
System.err.println(JoglVersion.getInstance());
GLProfile.initSingleton(false);
diff --git a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
index 95c994d..1cc2298 100644
--- a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
@@ -872,7 +872,7 @@ public class GLWindow implements GLAutoDrawable, Window, NEWTEventConsumer, FPSC
public static void main(String args[]) {
System.err.println(VersionUtil.getPlatformInfo());
System.err.println(GlueGenVersion.getInstance());
- System.err.println(NativeWindowVersion.getInstance());
+ // System.err.println(NativeWindowVersion.getInstance());
System.err.println(JoglVersion.getInstance());
System.err.println(NewtVersion.getInstance());
diff --git a/src/newt/classes/jogamp/newt/driver/android/NewtVersionActivity.java b/src/newt/classes/jogamp/newt/driver/android/NewtVersionActivity.java
index 4c9ccfb..5842a28 100644
--- a/src/newt/classes/jogamp/newt/driver/android/NewtVersionActivity.java
+++ b/src/newt/classes/jogamp/newt/driver/android/NewtVersionActivity.java
@@ -27,31 +27,21 @@
*/
package jogamp.newt.driver.android;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLProfile;
-
-import com.jogamp.newt.NewtFactory;
-import com.jogamp.newt.Display;
-import com.jogamp.newt.Screen;
-import com.jogamp.newt.ScreenMode;
-import com.jogamp.newt.Window;
-import com.jogamp.newt.event.ScreenModeListener;
+import com.jogamp.common.GlueGenVersion;
+import com.jogamp.common.os.Platform;
+import com.jogamp.common.util.VersionUtil;
import com.jogamp.newt.opengl.GLWindow;
-import jogamp.newt.driver.android.test.GearsGL2ES1;
+import com.jogamp.opengl.JoglVersion;
import com.jogamp.opengl.util.Animator;
-import jogamp.newt.driver.android.AndroidWindow;
-
-import android.app.Activity;
-import android.content.res.Configuration;
import android.os.Bundle;
import android.util.Log;
-import android.view.SurfaceView;
-import android.view.View;
+import android.widget.TextView;
public class NewtVersionActivity extends NewtBaseActivity {
GLWindow glWindow = null;
Animator animator = null;
+ TextView tv = null;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -64,12 +54,16 @@ public class NewtVersionActivity extends NewtBaseActivity {
System.setProperty("jogamp.debug.NativeLibrary", "true");
// System.setProperty("jogamp.debug.NativeLibrary.Lookup", "true");
+ tv = new TextView(this);
+ tv.setText(VersionUtil.getPlatformInfo()+Platform.NEWLINE+GlueGenVersion.getInstance()+Platform.NEWLINE+JoglVersion.getInstance()+Platform.NEWLINE);
+ setContentView(tv);
+ /**
// create GLWindow (-> incl. underlying NEWT Display, Screen & Window)
GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GLES1));
glWindow = GLWindow.create(caps);
setContentView(glWindow);
- glWindow.addGLEventListener(new GearsGL2ES1(1));
+ glWindow.addGLEventListener(new GearsES1(1));
glWindow.getWindow().getScreen().addScreenModeListener(new ScreenModeListener() {
public void screenModeChangeNotify(ScreenMode sm) { }
public void screenModeChanged(ScreenMode sm, boolean success) {
@@ -78,7 +72,7 @@ public class NewtVersionActivity extends NewtBaseActivity {
});
glWindow.setVisible(true);
animator = new Animator(glWindow);
- animator.setUpdateFPSFrames(60, System.err);
+ animator.setUpdateFPSFrames(60, System.err); */
Log.d(MD.TAG, "onCreate - X");
}
diff --git a/src/newt/classes/jogamp/newt/driver/awt/opengl/VersionApplet.java b/src/newt/classes/jogamp/newt/driver/awt/opengl/VersionApplet.java
index 1cff768..ae0a790 100644
--- a/src/newt/classes/jogamp/newt/driver/awt/opengl/VersionApplet.java
+++ b/src/newt/classes/jogamp/newt/driver/awt/opengl/VersionApplet.java
@@ -86,17 +86,21 @@ public class VersionApplet extends Applet {
System.err.println(s);
tareaVersion.append(s);
+ /*
s = NativeWindowVersion.getInstance().toString();
System.err.println(s);
- tareaVersion.append(NativeWindowVersion.getInstance().toString());
+ tareaVersion.append(NativeWindowVersion.getInstance().toString());
+ */
s = JoglVersion.getInstance().toString();
System.err.println(s);
tareaVersion.append(s);
+ /*
s = NewtVersion.getInstance().toString();
System.err.println(s);
tareaVersion.append(s);
+ */
tareaCaps = new TextArea(120, 20);
GLDrawableFactory factory = GLDrawableFactory.getFactory(glp);