Skip to content
The Jenkins Controller is preparing for shutdown. No new builds can be started.
Success

Changes

Summary

  1. Make gluegen output messages more informative (details)
  2. Remove unused file cl_render_ext.h (details)
  3. Upgrade OpenCL headers to standard Khronos version 1.1 (details)
  4. Remove copy of generated Java files to build-temp directory (details)
  5. Add OpenCL 1.2 and 2.0 headers and CLImpl classes (details)
  6. Add explicit version number to original CL impl classes. (details)
  7. Factor out common custom C and Java code to reduce duplication (details)
  8. Add ability to access newer CLImpl versions for devices (details)
  9. Remove use of CL*Binding interfaces (details)
  10. Remove creation and all references to CL*Binding interfaces (details)
  11. Remove CLGL interface (details)
  12. Add versioned interfaces for CL 1.1, 1.2, and 2.0 (details)
  13. Replace erroneous tabs with spaces. (details)
  14. Remove unused stuff from build.xml (details)
  15. Fix generated files dependency check; remove unused include paths (details)
  16. Fix CLProgram build lock to work on Intel OpenCL implementation (details)
  17. Fix CLProgramTest for Intel OpenCL (details)
  18. Fix command queue test for Intel (details)
  19. Fix compilation of OpenCL 2.x headers on OS X (details)
  20. Fix OS X 32-bit builds for OpenCL 1.2 and 2.0 (details)
  21. Bug 1268: Adapt to GlueGen commit (details)
  22. Bump scripts to jre1.8.0_66 (details)
Commit 394af6f8b0c648ff9d8005157dd47cb7968a0b12 by Wade Walker
Make gluegen output messages more informative
The file was modifiedmake/build.xml (diff)
Commit baef9bd212f6f7c24185254ba1755d3d83c057f9 by Wade Walker
Remove unused file cl_render_ext.h
This originally held definitions that hadn't been finalized before the
release of OpenGL 1.1, but later those were put in the normal set of
header files, making this file redundant.
The file was modifiedmake/build.xml (diff)
The file was removedmake/stub_includes/CL_orig/cl_vendor_ext.h
Commit 2cef8bb275deb1e003c9c4b0e911cdc0195970d7 by Wade Walker
Upgrade OpenCL headers to standard Khronos version 1.1
They were previously a pre-release version of 1.1 that had some manual
changes and upgrades. This moves to the canonical versions downloaded
from khronos.org.
The file was modifiedmake/build.xml (diff)
The file was removedmake/stub_includes/CL_orig/cl.h
The file was addedmake/stub_includes/CL11/cl_gl_ext.h
The file was removedmake/stub_includes/CL_orig/cl_gl_ext.h
The file was addedmake/stub_includes/CL11/cl.h
The file was removedmake/stub_includes/CL_orig/cl_platform.h
The file was removedmake/stub_includes/CL_orig/cl_gl.h
The file was addedmake/stub_includes/CL11/cl_platform.h
The file was removedmake/stub_includes/CL_orig/cl_ext.h
The file was addedmake/stub_includes/CL11/cl_gl.h
The file was addedmake/stub_includes/CL11/opencl.h
The file was modifiedmake/config/cl-common.cfg (diff)
The file was addedmake/stub_includes/CL11/cl_ext.h
Commit 85dc2b1357470d2a51a69080d33aac442eae291f by Wade Walker
Remove copy of generated Java files to build-temp directory
This build step doesn't seem to be needed; can just read the files where
they're created in the build directory and everything works the same.
The file was modifiedmake/config/cl-if.cfg (diff)
The file was modifiedmake/build.xml (diff)
Commit e56a17d6d7780b8597c78ce50808c8da68d094b5 by Wade Walker
Add OpenCL 1.2 and 2.0 headers and CLImpl classes
Added stub includes for OpenCL 1.2 and 2.0. Added new CLImpl versions
for 1.2 and 2.0 to the build, but left them unused for now. The CL
bindings used by JOCL are still generated from OpenCL 1.1, so the
existing Java code will be able to stay mostly unchanged in the future.
The file was addedmake/stub_includes/CL20/cl_egl.h
The file was addedmake/stub_includes/CL20/opencl.h
The file was addedmake/config/clImplCustomCode20.c
The file was addedmake/stub_includes/CL20/cl_gl_ext.h
The file was addedmake/config/cl-impl-12.cfg
The file was addedmake/stub_includes/CL12/cl_egl.h
The file was addedmake/stub_includes/CL20/cl.h
The file was addedmake/stub_includes/CL12/cl.h
The file was addedmake/stub_includes/CL12/cl_ext.h
The file was modifiedmake/build.xml (diff)
The file was addedmake/config/clImplCustomCode12.c
The file was addedmake/stub_includes/CL20/cl_ext.h
The file was addedmake/stub_includes/CL20/cl_gl.h
The file was addedmake/stub_includes/CL20/cl_platform.h
The file was modifiedmake/config/cl-common.cfg (diff)
The file was addedmake/stub_includes/CL12/cl_gl.h
The file was addedmake/config/cl-impl-20.cfg
The file was addedmake/stub_includes/CL12/opencl.h
The file was modifiedmake/config/cl-impl.cfg (diff)
The file was addedmake/config/clImplCustomCode12.java
The file was addedmake/config/clImplCustomCode20.java
The file was addedmake/stub_includes/CL12/cl_platform.h
The file was addedmake/stub_includes/CL12/cl_gl_ext.h
Commit 9a90181ed1fb596275fee9ebca0f3d1093722ca9 by Wade Walker
Add explicit version number to original CL impl classes.
This makes all three versions (1.1, 1.2, and 2.0) use the same naming
convention, and sets me up to use the unversioned name to factor out
code common to all three.
The file was addedmake/config/clImplCustomCode11.java
The file was removedmake/config/cl-impl.cfg
The file was removedsrc/com/jogamp/opencl/llb/impl/CLImpl.java
The file was modifiedmake/build.xml (diff)
The file was modifiedsrc/com/jogamp/opencl/llb/impl/CLDynamicLibraryBundleInfo.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLPlatform.java (diff)
The file was addedmake/config/cl-impl-11.cfg
The file was addedsrc/com/jogamp/opencl/llb/impl/CLImpl11.java
The file was removedmake/config/clImplCustomCode.c
The file was addedmake/config/clImplCustomCode11.c
The file was removedmake/config/clImplCustomCode.java
The file was modifiedsrc/com/jogamp/opencl/util/CLInfo.java (diff)
The file was modifiedtest/com/jogamp/opencl/test/util/MiscUtils.java (diff)
Commit 4638f4b3fdf4c946bda0b290a83652e4db00edea by Wade Walker
Factor out common custom C and Java code to reduce duplication
Consolidated C custom code so common functions are only defined once in
the 1.1 version, then are called from the 1.2 and 2.0 version. Pulled
common code in CLImpl up into the autogenerated implementation class and
removed the hand-written implementation (since it was left empty).
Factored custom Java code out so there was as little duplication as
possible across the three CLImpl versions, with common code for all
three versions in clImplCustomCode.java.
The file was modifiedmake/config/clImplCustomCode12.java (diff)
The file was modifiedmake/config/cl-impl-11.cfg (diff)
The file was addedmake/config/clImplCustomCode.java
The file was modifiedmake/config/clImplCustomCode11.c (diff)
The file was modifiedmake/config/clImplCustomCode20.java (diff)
The file was modifiedmake/build.xml (diff)
The file was modifiedmake/config/clImplCustomCode20.c (diff)
The file was modifiedsrc/com/jogamp/opencl/llb/impl/CLDynamicLibraryBundleInfo.java (diff)
The file was modifiedmake/config/clImplCustomCode11.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLPlatform.java (diff)
The file was modifiedtest/com/jogamp/opencl/test/util/MiscUtils.java (diff)
The file was addedmake/config/clImplCustomCode.c
The file was modifiedmake/config/clImplCustomCode12.c (diff)
The file was modifiedmake/config/cl-impl-20.cfg (diff)
The file was removedsrc/com/jogamp/opencl/llb/impl/CLImpl11.java
The file was modifiedmake/config/cl-impl-12.cfg (diff)
Commit 7c7146428a0584ad38f036d24a70c15f700f9a8e by Wade Walker
Add ability to access newer CLImpl versions for devices
Added a CLPlatform method to return a CLImpl version specific to a
device. This lets the user get a CLImpl12 or CLImpl20 instance which
they could then cast to the right type and use to access newer CL
functions than those in the default CLImpl11 object.
The file was modifiedsrc/com/jogamp/opencl/util/CLInfo.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLVersion.java (diff)
The file was modifiedtest/com/jogamp/opencl/LowLevelBindingTest.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLPlatform.java (diff)
Commit 4f45fe8db1b5c3790ef2659995c2065807c3fe74 by Wade Walker
Remove use of CL*Binding interfaces
In preparation for removing the interfaces themselves
The file was modifiedsrc/com/jogamp/opencl/CLContext.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLPlatform.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLImage2d.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLKernel.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLBuffer.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLImage3d.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLMemory.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLCommandQueue.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLProgram.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLEventList.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLUserEvent.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLEvent.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLDevice.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLImage.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLSampler.java (diff)
Commit 37c656e3290ff855e1752f9b8a4b830da3000b85 by Wade Walker
Remove creation and all references to CL*Binding interfaces
This completes the removal of all CL*Binding interfaces; all tests pass
at this point.
The file was modifiedsrc/com/jogamp/opencl/gl/CLGLContext.java (diff)
The file was removedmake/config/cl-platform-if.cfg
The file was modifiedsrc/com/jogamp/opencl/spi/CLAccessorFactory.java (diff)
The file was removedmake/config/cl-event-if.cfg
The file was modifiedtest/com/jogamp/opencl/HighLevelBindingTest.java (diff)
The file was modifiedsrc/com/jogamp/opencl/impl/CLTLAccessorFactory.java (diff)
The file was removedmake/config/cl-queue-if.cfg
The file was removedmake/config/cl-sampler-if.cfg
The file was removedmake/config/cl-context-if.cfg
The file was modifiedsrc/com/jogamp/opencl/gl/CLGLImage2d.java (diff)
The file was removedmake/config/cl-buffer-if.cfg
The file was removedmake/config/cl-image-if.cfg
The file was modifiedtest/com/jogamp/opencl/CLCommandQueueTest.java (diff)
The file was modifiedsrc/com/jogamp/opencl/gl/CLGLTexture3d.java (diff)
The file was modifiedmake/build.xml (diff)
The file was modifiedsrc/com/jogamp/opencl/CLPlatform.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLException.java (diff)
The file was modifiedsrc/com/jogamp/opencl/gl/CLGLTexture2d.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLEvent.java (diff)
The file was modifiedmake/config/cl-if.cfg (diff)
The file was removedmake/config/cl-mem-if.cfg
The file was removedmake/config/cl-program-if.cfg
The file was removedmake/config/cl-device-if.cfg
The file was modifiedtest/com/jogamp/opencl/LowLevelBindingTest.java (diff)
The file was removedmake/config/cl-kernel-if.cfg
Commit 0135df38d6ccdf17283a26c9c56adb08a0e6d30e by Wade Walker
Remove CLGL interface
This removes the last sub-interface that would have to be separately
versioned for future versions of OpenCL. After this, new OpenCL versions
will only create one new interface and one new implementation.
The file was removedmake/config/clgl-if.cfg
The file was modifiedmake/build.xml (diff)
The file was modifiedsrc/com/jogamp/opencl/gl/CLGLBuffer.java (diff)
The file was modifiedmake/config/cl-impl-11.cfg (diff)
The file was modifiedsrc/com/jogamp/opencl/gl/CLGLImage2d.java (diff)
The file was modifiedmake/config/cl-if.cfg (diff)
The file was modifiedsrc/com/jogamp/opencl/CLEvent.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLException.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLCommandQueue.java (diff)
The file was modifiedsrc/com/jogamp/opencl/gl/CLGLTexture3d.java (diff)
The file was modifiedsrc/com/jogamp/opencl/gl/CLGLTexture2d.java (diff)
The file was modifiedsrc/com/jogamp/opencl/gl/CLGLContext.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLMemory.java (diff)
The file was modifiedmake/config/cl-impl-12.cfg (diff)
The file was modifiedmake/config/cl-impl-20.cfg (diff)
Commit 050279e6ccd7a3fcc4031730f7e157a3d10e28cb by Wade Walker
Add versioned interfaces for CL 1.1, 1.2, and 2.0
Now all three derive from CL, which is currently 1.1.
The file was modifiedmake/config/cl-impl-20.cfg (diff)
The file was modifiedmake/config/cl-impl-12.cfg (diff)
The file was modifiedmake/config/cl-impl-11.cfg (diff)
The file was modifiedmake/build.xml (diff)
Commit 2f3c7cd46f0faee9e973ce09fe9135dc62af80a1 by Wade Walker
Replace erroneous tabs with spaces.
The file was modifiedmake/build.xml (diff)
Commit e899c162c2dfefd58857b0dcc07ac56db6d6cd0d by Wade Walker
Remove unused stuff from build.xml
Removed header file downloader task which was no longer used (and not
really possible to use, given the amount of manual tweaking needed to
get gluegen to run on a new set of header files). Removed some
commented-out lines that were obsolete. Fixed some formatting. Removed
some ARMv6-related stuff that made no sense for JOCL (was inherited from
JOAL). Added some forgotten dependency paths.
The file was modifiedmake/build.xml (diff)
Commit 010a5205cc79351816b13ef504127152c44d36e3 by Wade Walker
Fix generated files dependency check; remove unused include paths
Fixed the dependency check for generated files; previously we were
looking at the wrong path, and always regenerating all files. Also
removed some include paths that don't contain any files, and renamed
some filesets so it's more clear what they contain.
The file was modifiedmake/build.xml (diff)
Commit ba691aeb833671c57f59d1bcfa1ffc842f09d6df by Wade Walker
Fix CLProgram build lock to work on Intel OpenCL implementation
The Intel OpenCL implementation calls the clBuildProgram notify function
on a different thread, so had to change a reentrant lock to a semaphore
to allow this.
The file was modifiedsrc/com/jogamp/opencl/CLProgram.java (diff)
Commit 2739f7be10bd7fbd11d4a85d2e7636793f9c815e by Wade Walker
Fix CLProgramTest for Intel OpenCL
Added a couple of differences in test results for programs recreated
from binaries (the programs are executable and have binary length > 0),
and avoided the CL kernel creation test on a binary because it segfaults
like it does on AMD drivers.
The file was modifiedtest/com/jogamp/opencl/CLProgramTest.java (diff)
The file was modifiedsrc/com/jogamp/opencl/CLPlatform.java (diff)
Commit 215901444d8fd98a14f190e6aa10c17b84ee4b7d by Wade Walker
Fix command queue test for Intel
User events start as CL_SUBMITTED instead of CL_QUEUE on Intel.
The file was modifiedtest/com/jogamp/opencl/CLCommandQueueTest.java (diff)
Commit ad95421312871694ec8009d9f92089c79b9f8607 by Wade Walker
Fix compilation of OpenCL 2.x headers on OS X
The include files were getting the OS X framework files from OpenCL/*.h,
instead of the local stub files from CL/*.h, which meant that OpenCL
2.x-related things were undefined. Changed OpenCL 2.x stub files to
refer to local .h files only. Maybe later change 1.x also, but leaving
it for now to minimize disruption to working code.
The file was modifiedmake/stub_includes/CL20/opencl.h (diff)
The file was modifiedmake/stub_includes/CL11/cl.h (diff)
The file was modifiedmake/stub_includes/CL20/cl_ext.h (diff)
The file was modifiedmake/stub_includes/CL20/cl_gl_ext.h (diff)
The file was modifiedmake/stub_includes/CL20/cl_gl.h (diff)
The file was modifiedmake/stub_includes/CL20/cl.h (diff)
The file was modifiedmake/stub_includes/CL12/cl.h (diff)
The file was modifiedmake/stub_includes/CL20/cl_platform.h (diff)
Commit edd9720fbb570e0fe177cc41d3612084ea8a7b17 by Wade Walker
Fix OS X 32-bit builds for OpenCL 1.2 and 2.0
Copies changes from Sven's commit
f7c50fca34df0b5d393ffab0da09bce19ddfba64 into the two new config files
for OpenCL 1.2 and 2.0, so the fix will be present in all three
versions.
The file was modifiedmake/config/cl-impl-20.cfg (diff)
The file was modifiedmake/config/cl-impl-12.cfg (diff)
Commit ff6079a7409f97188d1dde707ad356afcba5ed14 by Sven Gothel
Bug 1268: Adapt to GlueGen commit
2034bbfac88b7d1360f9c939e173ff758f7f47ac
The file was modifiedsrc/com/jogamp/opencl/llb/impl/CLDynamicLibraryBundleInfo.java (diff)
Commit a6b1054ff294a4208a5fec4a4de728be6505b0b4 by Sven Gothel
Bump scripts to jre1.8.0_66
The file was modifiedmake/scripts/make.jocl.all.win64.bat (diff)
The file was modifiedmake/scripts/tests-x64.bat (diff)
The file was modifiedmake/scripts/make.jocl.all.win32.bat (diff)
The file was modifiedmake/scripts/tests-x32.bat (diff)