diff options
| author | Sven Gothel <[email protected]> | 2014-06-17 03:32:45 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-06-17 03:32:45 +0200 |
| commit | b378d9ceb20016eeadc536682a08df9acc67aee6 (patch) | |
| tree | 5dfd600d786ff1ddabf13117e71a1b2c9a004548 | |
| parent | 71c6288353553056a955210d051b36617efee464 (diff) | |
Adapt to GlueGen commit c3054a01990e55ab35756ea23ab7d7c05f24dd37 (compount call-by-value extension)
| -rw-r--r-- | make/config/cl-impl.cfg | 1 | ||||
| -rw-r--r-- | make/config/clImplCustomCode.java | 3 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/make/config/cl-impl.cfg b/make/config/cl-impl.cfg index a7b5395..4444b26 100644 --- a/make/config/cl-impl.cfg +++ b/make/config/cl-impl.cfg @@ -93,5 +93,6 @@ ForceProcAddressGen clEnqueueMapImage #include custom code IncludeAs CustomJavaCode CLAbstractImpl clImplCustomCode.java +ManualStaticInit CLAbstractImpl IncludeAs CustomCCode clImplCustomCode.c diff --git a/make/config/clImplCustomCode.java b/make/config/clImplCustomCode.java index 6c40711..f57995d 100644 --- a/make/config/clImplCustomCode.java +++ b/make/config/clImplCustomCode.java @@ -19,6 +19,9 @@ return null; } addressTable.reset(bundle); + if( !initializeImpl() ) { + throw new RuntimeException("Initialization failure"); + } return bundle; } } ); } diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index bc718c4..a839c17 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -63,7 +63,7 @@ function jrun() { #D_ARGS="-Djocl.debug=all" #D_ARGS="-Djogamp.debug=all -Djocl.debug=all" #D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup -Djogamp.debug.JNILibLoader -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil -Djocl.debug=all" - D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup -Djogamp.debug.JNILibLoader" + #D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup -Djogamp.debug.JNILibLoader" #X_ARGS="-Dsun.java2d.noddraw=true -Dsun.awt.noerasebackground=true" #X_ARGS="-verbose:jni" @@ -115,7 +115,7 @@ function testawt() { # # -testnoawt com.jogamp.opencl.CLBufferTest $* +#testnoawt com.jogamp.opencl.CLBufferTest $* #testnoawt com.jogamp.opencl.CLCommandQueueTest $* #testnoawt com.jogamp.opencl.CLExceptionTest $* #testnoawt com.jogamp.opencl.CLImageTest $* @@ -124,7 +124,7 @@ testnoawt com.jogamp.opencl.CLBufferTest $* #testnoawt com.jogamp.opencl.LowLevelBindingTest $* #testnoawt com.jogamp.opencl.TestJoclVersion $* #testnoawt com.jogamp.opencl.TestUtils $* -#testnoawt com.jogamp.opencl.gl.CLGLTest $* +testnoawt com.jogamp.opencl.gl.CLGLTest $* #testnoawt com.jogamp.opencl.util.concurrent.CLMultiContextTest $* |