diff options
author | Sven Gothel <[email protected]> | 2019-09-08 12:56:57 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2019-09-08 12:56:57 +0200 |
commit | 534d764474cacf8bc380123cbfd164c7c55f236a (patch) | |
tree | f87a883e0962df6a8e6d9270967527fba943e37c /make/scripts | |
parent | 125e4bd1c8e0a8f4b434209b155e6cd0d8f09092 (diff) |
Buig 1389: Fix SIGSEGV on OpenJDK11 on [NSApplicationAWT sendEvent:]
Culprit of the crash and the non propagated action on NSApp main-thread
was _simply_ our OSXUtil_KickNSApp() 'kick alive'
NSApplicationDefined NSEvent sent to the NSApp.
Java11's NSApp code overrides sendEvent and handles
NSApplicationDefined + subtype=ExecuteBlockEvent
using the given data1 as a function pointer. 8-O
ExecuteBlockEvent defined as 0, which we have sent.
Simply passing subtype=8888 avoids this side-effect.
Whether it is still required to KickNSApp() is another question.
+++
Further, make code a bit more robuts regarding the offscreenSurfaceLayer
at JAWTWindow invalidate. I.e. if still not detached, do the late cleanup there.
This just in case the OSX Context callback to disassociate the drawable
has been missed.
Diffstat (limited to 'make/scripts')
-rw-r--r-- | make/scripts/tests-osx-junit-swt.sh (renamed from make/scripts/tests-macosx64-junit-swt.sh) | 0 | ||||
-rwxr-xr-x | make/scripts/tests-osx-x64-java8.sh | 18 | ||||
-rwxr-xr-x | make/scripts/tests-osx-x64.sh | 2 | ||||
-rw-r--r-- | make/scripts/tests.sh | 8 |
4 files changed, 24 insertions, 4 deletions
diff --git a/make/scripts/tests-macosx64-junit-swt.sh b/make/scripts/tests-osx-junit-swt.sh index 2a6ccd63a..2a6ccd63a 100644 --- a/make/scripts/tests-macosx64-junit-swt.sh +++ b/make/scripts/tests-osx-junit-swt.sh diff --git a/make/scripts/tests-osx-x64-java8.sh b/make/scripts/tests-osx-x64-java8.sh new file mode 100755 index 000000000..7643919bc --- /dev/null +++ b/make/scripts/tests-osx-x64-java8.sh @@ -0,0 +1,18 @@ +#! /bin/bash + +#export DYLD_LIBRARY_PATH=$HOME/ffmpeg-0.8_0.9/lib:$DYLD_LIBRARY_PATH +#export DYLD_LIBRARY_PATH=$HOME/ffmpeg-2.2.3/lib:$DYLD_LIBRARY_PATH +export DYLD_LIBRARY_PATH=/usr/local/Cellar/ffmpeg/2.8/lib:$DYLD_LIBRARY_PATH + +#JAVA_HOME=`/usr/libexec/java_home` +JAVA_HOME=`/usr/libexec/java_home -version 1.8` +#JAVA_HOME=`/usr/libexec/java_home -version 11` +PATH=$JAVA_HOME/bin:$PATH +export JAVA_HOME PATH + +export SWT_CLASSPATH=`pwd`/lib/swt/cocoa-macosx-x86_64/swt.jar + +spath=`dirname $0` + +. $spath/tests.sh $JAVA_HOME/bin/java -DummyArg ../build-macosx $* + diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh index d0f244e93..67f3aaa50 100755 --- a/make/scripts/tests-osx-x64.sh +++ b/make/scripts/tests-osx-x64.sh @@ -14,5 +14,5 @@ export SWT_CLASSPATH=`pwd`/lib/swt/cocoa-macosx-x86_64/swt.jar spath=`dirname $0` -. $spath/tests.sh $JAVA_HOME/bin/java -DummyArg ../build-macosx $* +. $spath/tests.sh $JAVA_HOME/bin/java --illegal-access=warn ../build-macosx $* diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 95917b7b5..75faeae3a 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -107,7 +107,7 @@ function jrun() { #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.TraceGL -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" #D_ARGS="-Djogl.debug.GLProfile -Djogl.debug.GLContext -Djogl.quirks.force=GL3CompatNonCompliant,NoSurfacelessCtx -Djogl.disable.opengles" #D_ARGS="-Djogl.quirks.force=NoDoubleBufferedPBuffer" - D_ARGS="-Dnativewindow.debug.GraphicsConfiguration" + #D_ARGS="-Dnativewindow.debug.GraphicsConfiguration" #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=600000" #D_ARGS="-Djogamp.debug=all" @@ -120,7 +120,9 @@ function jrun() { #D_ARGS="-Djogamp.debug=all -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" #D_ARGS="-Dnativewindow.debug.JAWT -Djogamp.debug.UnsafeUtil" + #D_ARGS="-Dnativewindow.debug.OSXUtil -Dnativewindow.debug.JAWT -Djogl.debug.GLContext -Djogl.debug.GLCanvas" #X_ARGS="--illegal-access=warn" + #D_ARGS="-Djogamp.debug.NativeLibrary=true -Djogamp.debug.JNILibLoader=true" #D_ARGS="-Djogl.debug.GLContext -Djogamp.debug.NativeLibrary -Djogamp.debug.JNILibLoader -Djogl.debug.DebugGL -Djogl.debug.GLDebugMessageHandler" #D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup -Djogamp.debug.JNILibLoader -Djogl.debug.GLContext" @@ -947,7 +949,7 @@ function testawtswt() { # 2.4.0 Regressions # # OSX -#testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsAWT $* +testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsAWT $* #testawt com.jogamp.opengl.test.junit.newt.parenting.TestParenting01dAWT $* # Linux Mesa/AMD: @@ -959,7 +961,7 @@ function testawtswt() { # Linux Mesa/Soft #testnoawt com.jogamp.opengl.test.junit.jogl.math.TestPMVMatrix01NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $* -testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile03NEWTOffscreen $* +#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile03NEWTOffscreen $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLWindowNEWT $* # ATI/Linux: XCB Unknown request in queue while dequeuing |