diff options
5 files changed, 15 insertions, 0 deletions
diff --git a/make/scripts/make.jogl.all.linux-x86.sh b/make/scripts/make.jogl.all.linux-x86.sh index 5b443f5d3..7b08ae5e8 100644 --- a/make/scripts/make.jogl.all.linux-x86.sh +++ b/make/scripts/make.jogl.all.linux-x86.sh @@ -39,6 +39,9 @@ fi # -DisX11=true \ # -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86 \ +LD_PRELOAD=$J2RE_HOME/lib/i386/libjsig.so +export LD_PRELOAD + ant \ $CUSTOMLIBDIR \ -Dbuild.noarchives=true \ diff --git a/make/scripts/make.jogl.all.linux-x86_64.sh b/make/scripts/make.jogl.all.linux-x86_64.sh index b17cd2f15..45777998c 100644 --- a/make/scripts/make.jogl.all.linux-x86_64.sh +++ b/make/scripts/make.jogl.all.linux-x86_64.sh @@ -41,6 +41,9 @@ fi #LD_LIBRARY_PATH=/opt-linux-x86_64/mesa-7.8.1/lib64 #export LD_LIBRARY_PATH +LD_PRELOAD=$J2RE_HOME/lib/amd64/libjsig.so +export LD_PRELOAD + ant \ $CUSTOMLIBDIR \ -Dbuild.noarchives=true \ 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; |