diff options
author | Sven Gothel <[email protected]> | 2010-06-02 16:49:28 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2010-06-02 16:49:28 +0200 |
commit | 6bbf70d2f4a06b8aa0b100d83ed9aca6dd80040e (patch) | |
tree | 16d4d879a35b7645f46bbd947bed5b52c6022940 /src | |
parent | 42dbcf2a74eb91d4a165f815429c121c4beb0501 (diff) |
JOGL: Sanity check in GLDrawableHelper (Context creation and initAction) ; Add Platform info in test
Diffstat (limited to 'src')
3 files changed, 9 insertions, 0 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java index 7a4e84081..fca0a7d93 100644 --- a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java +++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java @@ -136,6 +136,9 @@ public class GLDrawableHelper { lastContext.release(); } + if(!context.isCreated() && null == initAction) { + throw new GLException("Context has to be created, but no initAction is given: "+context); + } int res = 0; try { res = context.makeCurrent(); diff --git a/src/junit/com/jogamp/test/junit/jogl/acore/DumpVersion.java b/src/junit/com/jogamp/test/junit/jogl/acore/DumpVersion.java index 802936d2c..5bba65002 100644 --- a/src/junit/com/jogamp/test/junit/jogl/acore/DumpVersion.java +++ b/src/junit/com/jogamp/test/junit/jogl/acore/DumpVersion.java @@ -39,6 +39,7 @@ import org.junit.AfterClass; import org.junit.Test; import javax.media.opengl.*; +import com.jogamp.common.os.Platform; import java.io.IOException; @@ -47,6 +48,9 @@ public class DumpVersion implements GLEventListener { public void init(GLAutoDrawable drawable) { GL gl = drawable.getGL(); + System.err.println(Thread.currentThread()+" Platform: " + Platform.getOS() + " (os), " + Platform.getArch() + " (arch)"); + System.err.println(Thread.currentThread()+" Platform: littleEndian " + Platform.isLittleEndian() + ", 32Bit "+Platform.is32Bit() + ", a-ptr bit-size "+Platform.getPointerSizeInBits()); + System.err.println(Thread.currentThread()+" Platform: JavaSE " + Platform.isJavaSE()); System.err.println(Thread.currentThread()+" GL Profile " + gl.getGLProfile()); System.err.println(Thread.currentThread()+" CTX VERSION " + gl.getContext().getGLVersion()); System.err.println(Thread.currentThread()+" GL " + gl); diff --git a/src/junit/com/jogamp/test/junit/jogl/demos/gl2/gears/TestGearsAWT.java b/src/junit/com/jogamp/test/junit/jogl/demos/gl2/gears/TestGearsAWT.java index 21487c519..2df3f0de9 100755 --- a/src/junit/com/jogamp/test/junit/jogl/demos/gl2/gears/TestGearsAWT.java +++ b/src/junit/com/jogamp/test/junit/jogl/demos/gl2/gears/TestGearsAWT.java @@ -95,7 +95,9 @@ public class TestGearsAWT { Assert.assertNotNull(animator); animator.stop(); + Assert.assertEquals(false, animator.isAnimating()); frame.setVisible(false); + Assert.assertEquals(false, frame.isVisible()); frame.remove(glCanvas); frame.dispose(); frame=null; |