diff options
| author | Sven Gothel <[email protected]> | 2014-02-17 02:30:52 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-02-17 02:30:52 +0100 |
| commit | 569726132f622e290bebc5d40c96f8115dbcb5da (patch) | |
| tree | b68694bcf81370dbd3db9164f066979ea3cb58d5 /make/scripts | |
| parent | 43e07292432a8826e4ea426a2ba7c9a9d4b68537 (diff) | |
Fix Bug 920 - JOCL does not work on windows with 32 bit vm (1/2)
The 'clGetExtensionFunctionAddress' function pointer declaration was faulty,
i.e. using CL_API_ENTRY instead of CL_API_CALL.
CL_API_CALL on windows is defined as '__stdcall' which impacts Window 32bit platforms.
Fixed same issue w/:
- clCreateContext
- clBuildProgram
Same issue occurs with _all_ gluegen generated native function wrappers,
i.e. CL_API_CALL is missing in the function declarations!
I will follow-up w/ this fix in a bit ..
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/tests-win.bat | 14 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 10 |
2 files changed, 20 insertions, 4 deletions
diff --git a/make/scripts/tests-win.bat b/make/scripts/tests-win.bat index 583b5cde..ad4daf9a 100755 --- a/make/scripts/tests-win.bat +++ b/make/scripts/tests-win.bat @@ -1 +1,13 @@ -scripts\java-win.bat com.jogamp.opencl.JoclVersion %* +REM scripts\java-win.bat com.jogamp.opencl.JoclVersion %* + +scripts\java-win.bat com.jogamp.opencl.CLBufferTest %* +REM scripts\java-win.bat com.jogamp.opencl.CLCommandQueueTest %* +REM scripts\java-win.bat com.jogamp.opencl.CLExceptionTest %* +REM scripts\java-win.bat com.jogamp.opencl.CLImageTest %* +REM scripts\java-win.bat com.jogamp.opencl.CLProgramTest %* +REM scripts\java-win.bat com.jogamp.opencl.HighLevelBindingTest %* +REM scripts\java-win.bat com.jogamp.opencl.LowLevelBindingTest %* +REM scripts\java-win.bat com.jogamp.opencl.TestJoclVersion %* +REM scripts\java-win.bat com.jogamp.opencl.TestUtils %* +REM scripts\java-win.bat com.jogamp.opencl.gl.CLGLTest %* +REM scripts\java-win.bat com.jogamp.opencl.util.concurrent.CLMultiContextTest %* diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 3b69eac0..bc718c4f 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -60,8 +60,12 @@ function jrun() { #D_ARGS="-Dnativewindow.debug=all" #D_ARGS="-Djogl.debug=all" #D_ARGS="-Dnewt.debug=all" - #D_ARGS="-Djocl=all" + #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" + #X_ARGS="-Dsun.java2d.noddraw=true -Dsun.awt.noerasebackground=true" #X_ARGS="-verbose:jni" #X_ARGS="-Xrs" @@ -107,11 +111,11 @@ function testawt() { # # Version # -testnoawt com.jogamp.opencl.JoclVersion $* +#testnoawt com.jogamp.opencl.JoclVersion $* # # -#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 $* |