summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Load jocl.properties if present.Wade Walker2014-03-021-2/+2
| | | | This lets us build with debug information turned on.
* Fix C build warnings.Wade Walker2014-03-022-4/+3
| | | | | | Fixes -fno-rtti and implicit cast warnings. After this commit, all C warnings are gone except for one due to gluegen emitting char pointers instead of unsigned char pointers.
* Merge remote-tracking branch 'jogamporg/master'Wade Walker2014-02-251-0/+2
|\
| * Fix new subBufferTest02FloatBuffer() test on Solaris.v2.1.5Wade Walker2014-02-251-0/+2
| | | | | | | | | | | | | | The new OpenCL isAvailable() didn't make it into this test due to a merge slipup. Change-Id: I049388908b8f2f2869cc018dbf6be86d1a8dcb9d
| * Merge remote-tracking branch 'personal/bug_978_fix_solaris_tests'Wade Walker2014-02-2511-15/+110
| |\
* | \ Merge pull request #5 from WadeWalker/bug_978_fix_solaris_testsWade Walker2014-02-2411-15/+110
|\ \ \ | |/ / |/| / | |/ Fix OpenCL test failures on Solaris for bug 978.
| * Fix OpenCL test failures on Solaris.Wade Walker2014-02-2311-15/+110
| | | | | | | | | | | | | | | | | | | | Since nobody currently makes an OpenCL driver for Solaris, all the tests used to fail, which told us nothing. This commit adds code to check whether OpenCL is unavailable and the OS is Solaris, in which case the test contents are skipped. If an OpenCL driver ever appears for Solaris, or if we start testing on another platform with no OpenCL driver, there's now one single place to add or remove checks that will allow for this.
* | Merge remote-tracking branch ↵Sven Gothel2014-02-222-15/+48
|\ \ | | | | | | | | | 'wwalker/fix_jocl_bug_981_out_of_direct_buffer_memory'
| * | Fix memory problems in High/LowLevelBindingTests.Wade Walker2014-02-222-15/+48
| | | | | | | | | | | | | | | | | | | | | | | | These tests now adaptively reduce the global work size until they successfully allocate memory for their DirectByteBuffers. This makes the tests work on JVMs where XX:MaxDirectMemorySize is smaller than the modern defaults. These tests were failing on OS X 10.6 for this reason.
* | | Minor editing: Remove static imports, using 'final' add some '@XXX' ↵Sven Gothel2014-02-214-203/+203
| | | | | | | | | | | | | | | | | | decorations to remove warnings. Note 'static import' is evil .. :)
* | | Bug 979: Add 'CL_DEVICE_MEM_BASE_ADDR_ALIGN' to CLDevice and overal maximum ↵Sven Gothel2014-02-216-36/+101
| | | | | | | | | | | | | | | | | | to CLContext - Split CLBufferTest and use alignment. See Bug 979 for remaining issues and discussion.
* | | Fix build.xml (regression): Re-activate 'generate.jdk6.autocloseable, ↵Sven Gothel2014-02-211-1/+1
| | | | | | | | | | | | | | | | | | generate.jdk7.autocloseable' in java.generate.impl Regression of commit 46cc6ebfb2f53daebceb9a36b553ff01af56999f
* | | build.xml: Don't re-generate source (gluegen) if CLAbstractImpl_JNI.c ↵Sven Gothel2014-02-172-4/+9
| | | | | | | | | | | | uptodate (use java.generate.skip); Put native code on gensrc/native/jocl
* | | Fix Bug 920 - JOCL does not work on windows with 32 bit vm (2/2)Sven Gothel2014-02-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All gluegen generated native function wrappers, miss CL_API_CALL in the function declarations similar to commit 569726132f622e290bebc5d40c96f8115dbcb5da. Adding gluegen calling convention to cl-impl.cfg: LocalProcAddressCallingConvention __ALL__ CL_API_CALL All tests passed on windows 32bit now!
* | | Fix Bug 920 - JOCL does not work on windows with 32 bit vm (1/2)Sven Gothel2014-02-174-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ..
* | | Fix windows test scripts (CP, D_ARGS, ..)Sven Gothel2014-02-172-3/+14
| | |
* | | Fix build.xml: Remove gluegen config dependency on ../build using build-tempSven Gothel2014-02-172-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | Fix copy2temp target and issue it before gluegen of cl-if.cfg. Note: ${project.root}/build cannot be a hard-dependency since ${rootrel.build} is configurable hence ${project.root}/${rootrel.build}.
* | | Windows build scripts: Bump ant to 1.8.2Sven Gothel2014-02-172-2/+2
| | |
* | | script: set exec flagSven Gothel2014-02-151-0/+0
| | |
* | | Fix build scriptsSven Gothel2014-02-1513-29/+29
| | |
* | | Add scripts/check-junit.sh to validate local unit tests ..Sven Gothel2014-02-121-0/+39
|/ /
* / Fix unit test bugs on Mac OS X 64-bit.Wade Walker2014-02-085-21/+43
|/ | | | | | | | This commit fixes bugs 959 (local work size set incorrectly), 960 (concurrencyTest() throws ConcurrentModificationException) 963 (programBinariesTest() causes SIGSEGV) and 964 (builderTest() cases CL_INVALID_VALUE). After this commit, all JOCL tests should pass on 64-bit Mac OS X.
* Fix javadoc packagenamesv2.1.4Sven Gothel2014-01-311-2/+2
|
* MiscUtils: Forgot to change access of package-private to public due to new ↵Sven Gothel2014-01-261-2/+2
| | | | package location (sorry)
* Rename TestUtils -> MiscUtils (not a test), remove 'main' .. oopsSven Gothel2014-01-265-18/+6
|
* Unit Tests: Also test 'Test*' while excluding inner classesSven Gothel2014-01-261-0/+2
|
* Fix build.xml: Processed CL stub_includes _must_ reside in current folder ↵Sven Gothel2014-01-262-7/+16
| | | | | | | | | | | | | (make) due to relative fileset access only! Commit aac4c5fc4ab7c77eff3b71f518100dd182ec2c33 moved processed CL stub_includes to 'build/includes', which would be 'nice to have'. However, due to relative fileset restrictions, we must locate it from current folder 'make'. Not detected, since an old 'make/includes/CL' was still around. Using dedicated folder 'make/stub_includes.gen'.
* JoclVersionActivity: Dump info on stderr for adb logcatSven Gothel2014-01-261-0/+1
|
* Adapt all unit tests to use UITestCase and enforce named unit test order. ↵Sven Gothel2014-01-2611-113/+241
| | | | Added main entry and listed in tests.sh for manual test.
* Add unit test TestJoclVersion and UITestCase base class for singleton unit ↵Sven Gothel2014-01-264-2/+212
| | | | tests ; Fix setenv-jocl.sh: Add jocl-test.jar
* Cleanup Build: GlueGen config files, stub_includes; Add JoclVersion, Android ↵Sven Gothel2014-01-2671-73/+1130
| | | | | | | | | | | | | | | | | | JoclVersionActivity Cleanup Build: - Move gluegen config files into make/config (cleanup) - Move stub_includes into respective folder make/stub_includes and keep resources 'clean' JoclVersion: - Analoge to JoglVersion, replaces JOCLVersion (deprecated for now) - Added text based CL info dump. JoclVersionActivity: - Analog to JoclVersionActivity - Added full launch .. tested on Android (but no OpenCL avail.)
* build.xml: Fix jogl.build: Use [passed or default] jogl.build as well as ↵Sven Gothel2014-01-251-2/+3
| | | | rootrel.build (as gluegen does)
* Add '-b${joal.build.number}' to joal.version / archive.name ; Produce jar ↵Sven Gothel2014-01-252-18/+19
| | | | and apk files in ${build}/jar (as it was before new build system)
* Avoid sealed package violation: Move AutoCloseable to com.jogamp.openclSven Gothel2014-01-256-8/+7
|
* Bug 884: Move obsolete NB based build files to 'obsolete.make-nb' ; Fix text ↵Sven Gothel2014-01-2528-1/+3
| | | | file suffix ; Fix Jar Manifest: Move Sealed to bottom.
* Merge remote-tracking branch ↵Sven Gothel2014-01-2552-61/+1418
|\ | | | | | | 'wwalker/bug_884_replace_netbeans_build_with_jogamp_standard_build'
| * Bug 884: Add standard JogAmp build files.Wade Walker2013-12-1552-61/+1418
| | | | | | | | | | | | | | | | | | The new make/build.xml successfully builds and tests the project. The original NetBeans build files are still present, but won't work anymore since the resources directory is now inside the make directory. The new build files are based on those of JOAL. The new build is not yet minimized and cleaned up, because this commit is meant to be the minimum way to get things functional.
* | Jar Manifest: Add empty line before EOF (otherwise last line is cut-off - ↵Sven Gothel2014-01-231-0/+2
|/ | | | duh), add 'Application-Library-Allowable-Codebase: *'
* Use 'gluegen-clang.properties' for generic clang and ↵v2.1.3Sven Gothel2013-11-173-2/+47
| | | | 'gluegen-xcode_clang.properties' for OSX xcode-clang ; Add GNU/Linux LLVM/clang build scripts
* Bug 881 - Add 'Application-Name' in Jar's manifest to avoid Java6 NPEs ..v2.1.2Sven Gothel2013-11-011-0/+1
|
* Fix MacOSX build scripts / Add scripts/make.jocl.all.macosx-clang.shSven Gothel2013-10-242-0/+41
|
* CLDynamicLibraryBundleInfo: Add libPVROCL.so lookup if Android ..v2.1.1Sven Gothel2013-10-192-4/+13
|
* Bug 773 - Device specific JOCL dynamic library look-up on Android - Part 1/2Sven Gothel2013-10-197-162/+257
| | | | | | | | | Use DynamicLibraryBundleInfo w/ alternative native library names, drop manual coding of loading and binding, i.e. JOCLJNILibLoader. After trying opencl native libs (and failing), try GL libs .. We use a manual impl. to CL's 'clGetExtensionFunctionAddress' similar to JOAL, JOGL ...
* Bump 7u45Sven Gothel2013-10-182-4/+4
|
* Bug 579: Use result value in checkForError(..) for ↵Sven Gothel2013-10-124-29/+32
| | | | | | | | | | | | CLGLTexture2d.createFromGL*, CLGLTexture3d.createFromGL*, CLGLImage2d.createFromGL* and CLGLBuffer.createFromGL* - instead of returned 'id' Thank you Johan & Daniel ! Using your original patch, I went through the other CLGL[Texture*|Image2d|Buffer] classes and ensured all are handled the same. Reported and 1st patch provided by: Johan <[email protected]> Confirmed by: Daniel Balog <[email protected]>
* CLCommandQueue/CLException: Remove 'import static pack.class.*' for all ↵Sven Gothel2013-10-122-265/+258
| | | | (Easy on ClassLoader)
* Bug 552 putMapImage(..): Added variant w/ long[] imageRowPitch and long[] ↵Sven Gothel2013-10-121-1/+21
| | | | imageSlicePitch return values while always passing PointerBuffers (size_t*) for same values to clEnqueueMapImage(..)
* Fix Bug 573: putCopyBuffer(..)'s src/dest offset was not passed to ↵Sven Gothel2013-10-121-1/+1
| | | | putCopyBuffer(..) impl. method
* Refine 7b21b5abb6373637eeeb270de05bb7472f70b853: Add ↵Sven Gothel2013-10-123-31/+34
| | | | | | CLGL.CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE and comment it's usage; Remove 'import static' Note: JOCL impl. shall remove all 'import static' to remove hardhsip on ClassLoader ..
* Merge branch 'lixoman100/master': 'Fixes Bug 553, Bug 824 and Bug 825'Sven Gothel2013-10-122-4/+4
|\