diff options
Diffstat (limited to 'src/test/com/jogamp/opengl')
4 files changed, 22 insertions, 15 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDebug00NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDebug00NEWT.java index 62e74466f..629a613e9 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDebug00NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDebug00NEWT.java @@ -42,7 +42,6 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.Test; -import org.junit.BeforeClass; import com.jogamp.newt.Display; import com.jogamp.newt.NewtFactory; @@ -144,9 +143,9 @@ public class TestGLDebug00NEWT extends UITestCase { WindowContext winctx = createWindow(glp, true); MyGLDebugListener myGLDebugListener = new MyGLDebugListener( - GL2GL3.GL_DEBUG_SOURCE_API_ARB, - GL2GL3.GL_DEBUG_TYPE_ERROR_ARB, - GL2GL3.GL_DEBUG_SEVERITY_HIGH_ARB); + GL2GL3.GL_DEBUG_SOURCE_API, + GL2GL3.GL_DEBUG_TYPE_ERROR, + GL2GL3.GL_DEBUG_SEVERITY_HIGH); winctx.context.addGLDebugListener(myGLDebugListener); GL gl = winctx.context.getGL(); @@ -171,10 +170,10 @@ public class TestGLDebug00NEWT extends UITestCase { Assert.assertEquals((null == glDebugExt) ? false : true, winctx.context.isGLDebugMessageEnabled()); if( winctx.context.isGLDebugMessageEnabled() ) { - winctx.context.glDebugMessageInsert(GL2GL3.GL_DEBUG_SOURCE_APPLICATION_ARB, - GL2GL3.GL_DEBUG_TYPE_OTHER_ARB, + winctx.context.glDebugMessageInsert(GL2GL3.GL_DEBUG_SOURCE_APPLICATION, + GL2GL3.GL_DEBUG_TYPE_OTHER, dbgTstId0, - GL2GL3.GL_DEBUG_SEVERITY_MEDIUM_ARB, dbgTstMsg0); + GL2GL3.GL_DEBUG_SEVERITY_MEDIUM, dbgTstMsg0); Assert.assertEquals(true, myGLDebugListener.received()); } diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDebug01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDebug01NEWT.java index f9b566c25..5cace1eb9 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDebug01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDebug01NEWT.java @@ -91,10 +91,10 @@ public class TestGLDebug01NEWT extends UITestCase { if(ctx.isGLDebugMessageEnabled() && null != dbgTstMsg && 0 <= dbgTstId) { window.invoke(true, new GLRunnable() { public boolean run(GLAutoDrawable drawable) { - drawable.getContext().glDebugMessageInsert(GL2GL3.GL_DEBUG_SOURCE_APPLICATION_ARB, - GL2GL3.GL_DEBUG_TYPE_OTHER_ARB, + drawable.getContext().glDebugMessageInsert(GL2GL3.GL_DEBUG_SOURCE_APPLICATION, + GL2GL3.GL_DEBUG_TYPE_OTHER, dbgTstId, - GL2GL3.GL_DEBUG_SEVERITY_MEDIUM_ARB, dbgTstMsg); + GL2GL3.GL_DEBUG_SEVERITY_MEDIUM, dbgTstMsg); return true; } }); @@ -121,9 +121,9 @@ public class TestGLDebug01NEWT extends UITestCase { GLWindow window = createWindow(glp, true); MyGLDebugListener myGLDebugListener = new MyGLDebugListener( - GL2GL3.GL_DEBUG_SOURCE_API_ARB, - GL2GL3.GL_DEBUG_TYPE_ERROR_ARB, - GL2GL3.GL_DEBUG_SEVERITY_HIGH_ARB); + GL2GL3.GL_DEBUG_SOURCE_API, + GL2GL3.GL_DEBUG_TYPE_ERROR, + GL2GL3.GL_DEBUG_SEVERITY_HIGH); window.getContext().addGLDebugListener(myGLDebugListener); window.invoke(true, new GLRunnable() { diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMainVersionGLWindowNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMainVersionGLWindowNEWT.java index 41c6063dc..24ba59b57 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMainVersionGLWindowNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMainVersionGLWindowNEWT.java @@ -36,6 +36,7 @@ import com.jogamp.opengl.JoglVersion; import com.jogamp.opengl.test.junit.util.UITestCase; public class TestMainVersionGLWindowNEWT extends UITestCase { + private static String[] args = null; @Test public void testMain() throws InterruptedException { @@ -44,11 +45,12 @@ public class TestMainVersionGLWindowNEWT extends UITestCase { System.out.println("Implementation-Build: "+j.getImplementationBuild()); System.out.println("Implementation-Branch: "+j.getImplementationBranch()); System.out.println("Implementation-Commit: "+j.getImplementationCommit()); - GLWindow.main(null); + GLWindow.main(args); } - public static void main(String args[]) throws IOException { + public static void main(String[] args) throws IOException { + TestMainVersionGLWindowNEWT.args = args; String tstname = TestMainVersionGLWindowNEWT.class.getName(); org.junit.runner.JUnitCore.main(tstname); } diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java index a876b5c96..1a049c728 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java @@ -86,6 +86,7 @@ public class TestGearsES2NEWT extends UITestCase { static int loops = 1; static boolean loop_shutdown = false; static boolean forceES2 = false; + static boolean forceES3 = false; static boolean forceGL3 = false; static boolean mainRun = false; static boolean exclusiveContext = false; @@ -358,6 +359,8 @@ public class TestGearsES2NEWT extends UITestCase { final GLProfile glp; if(forceGL3) { glp = GLProfile.get(GLProfile.GL3); + } else if(forceES3) { + glp = GLProfile.get(GLProfile.GLES3); } else if(forceES2) { glp = GLProfile.get(GLProfile.GLES2); } else { @@ -433,6 +436,8 @@ public class TestGearsES2NEWT extends UITestCase { useAnimator = false; } else if(args[i].equals("-es2")) { forceES2 = true; + } else if(args[i].equals("-es3")) { + forceES3 = true; } else if(args[i].equals("-gl3")) { forceGL3 = true; } else if(args[i].equals("-wait")) { @@ -499,6 +504,7 @@ public class TestGearsES2NEWT extends UITestCase { System.err.println("loops "+loops); System.err.println("loop shutdown "+loop_shutdown); System.err.println("forceES2 "+forceES2); + System.err.println("forceES3 "+forceES3); System.err.println("forceGL3 "+forceGL3); System.err.println("swapInterval "+swapInterval); System.err.println("exclusiveContext "+exclusiveContext); |