Jogamp
jocl.git
23 months agoBump scripts to jre1.8.0_66 master rc
Sven Gothel [Mon, 16 Nov 2015 02:10:00 +0000 (03:10 +0100)]
Bump scripts to jre1.8.0_66

23 months agoBug 1268: Adapt to GlueGen commit 2034bbfac88b7d1360f9c939e173ff758f7f47ac
Sven Gothel [Sun, 15 Nov 2015 04:08:01 +0000 (05:08 +0100)]
Bug 1268: Adapt to GlueGen commit 2034bbfac88b7d1360f9c939e173ff758f7f47ac

23 months agoFix OS X 32-bit builds for OpenCL 1.2 and 2.0
Wade Walker [Sun, 8 Nov 2015 20:12:22 +0000 (14:12 -0600)]
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.

23 months agoFix compilation of OpenCL 2.x headers on OS X
Wade Walker [Sun, 1 Nov 2015 20:13:37 +0000 (14:13 -0600)]
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.

23 months agoFix command queue test for Intel
Wade Walker [Sun, 25 Oct 2015 02:18:09 +0000 (19:18 -0700)]
Fix command queue test for Intel

User events start as CL_SUBMITTED instead of CL_QUEUE on Intel.

23 months agoFix CLProgramTest for Intel OpenCL
Wade Walker [Sun, 25 Oct 2015 01:49:00 +0000 (18:49 -0700)]
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.

23 months agoFix CLProgram build lock to work on Intel OpenCL implementation
Wade Walker [Sun, 25 Oct 2015 00:39:15 +0000 (17:39 -0700)]
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.

23 months agoFix generated files dependency check; remove unused include paths
Wade Walker [Sun, 25 Oct 2015 19:36:39 +0000 (14:36 -0500)]
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.

23 months agoRemove unused stuff from build.xml
Wade Walker [Sat, 10 Oct 2015 18:34:32 +0000 (13:34 -0500)]
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.

23 months agoReplace erroneous tabs with spaces.
Wade Walker [Sat, 10 Oct 2015 17:43:31 +0000 (12:43 -0500)]
Replace erroneous tabs with spaces.

23 months agoAdd versioned interfaces for CL 1.1, 1.2, and 2.0
Wade Walker [Sun, 4 Oct 2015 21:00:01 +0000 (16:00 -0500)]
Add versioned interfaces for CL 1.1, 1.2, and 2.0

Now all three derive from CL, which is currently 1.1.

23 months agoRemove CLGL interface
Wade Walker [Sun, 4 Oct 2015 19:08:22 +0000 (14:08 -0500)]
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.

23 months agoRemove creation and all references to CL*Binding interfaces
Wade Walker [Sat, 3 Oct 2015 20:12:24 +0000 (15:12 -0500)]
Remove creation and all references to CL*Binding interfaces

This completes the removal of all CL*Binding interfaces; all tests pass
at this point.

23 months agoRemove use of CL*Binding interfaces
Wade Walker [Sat, 3 Oct 2015 19:14:25 +0000 (14:14 -0500)]
Remove use of CL*Binding interfaces

In preparation for removing the interfaces themselves

23 months agoAdd ability to access newer CLImpl versions for devices
Wade Walker [Sun, 20 Sep 2015 20:09:04 +0000 (15:09 -0500)]
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.

23 months agoFactor out common custom C and Java code to reduce duplication
Wade Walker [Sat, 19 Sep 2015 20:20:23 +0000 (15:20 -0500)]
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.

23 months agoAdd explicit version number to original CL impl classes.
Wade Walker [Sat, 12 Sep 2015 19:28:16 +0000 (14:28 -0500)]
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.

23 months agoAdd OpenCL 1.2 and 2.0 headers and CLImpl classes
Wade Walker [Mon, 7 Sep 2015 19:46:52 +0000 (14:46 -0500)]
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.

23 months agoRemove copy of generated Java files to build-temp directory
Wade Walker [Sun, 19 Jul 2015 20:16:10 +0000 (15:16 -0500)]
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.

23 months agoUpgrade OpenCL headers to standard Khronos version 1.1
Wade Walker [Thu, 23 Apr 2015 00:33:55 +0000 (19:33 -0500)]
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.

23 months agoRemove unused file cl_render_ext.h
Wade Walker [Wed, 15 Apr 2015 01:06:43 +0000 (20:06 -0500)]
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.

23 months agoMake gluegen output messages more informative
Wade Walker [Wed, 15 Apr 2015 00:42:32 +0000 (19:42 -0500)]
Make gluegen output messages more informative

2 years agoJOCL QueueThread extends InterruptSource.Thread v2.3.2
Sven Gothel [Sat, 3 Oct 2015 18:15:51 +0000 (20:15 +0200)]
JOCL QueueThread extends InterruptSource.Thread

2 years agoInclude Khronos derived glcorearb.h before cl_gl.h, avoiding typedef mismatch w/...
Sven Gothel [Tue, 14 Jul 2015 16:28:29 +0000 (18:28 +0200)]
Include Khronos derived glcorearb.h before cl_gl.h, avoiding typedef mismatch w/ APPLE's GL

LLVM's clang reports a typedef mismatch of GLintptr and GLsizeiptr
between the Khronos derived glcorearb.h (from JOGL) and APPLE's gltypes.h when producing 32bit builds.

+++

In file included from /usr/local/projects/jogamp/jocl/build-macosx-java6/gensrc/native/jocl/CLAbstractImpl_JNI.c:15:
/usr/local/projects/jogamp/jogl/make/stub_includes/opengl/GL/glcorearb.h:604:19: error: typedef redefinition with different types
      ('ptrdiff_t' (aka 'int') vs 'intptr_t' (aka 'long'))
typedef ptrdiff_t GLintptr;
                  ^
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/OpenGL.framework/Headers/gltypes.h:51:18: note:
      previous definition is here
typedef intptr_t GLintptr;

+++

I.e. Khronos uses ptrdiff_t (aka 'int' on 32bit), where APPLE uses intptr_t (aka 'long' on 32bit).

On OSX 32bit both ('int' and 'long') have the same sizeof value, i.e. 4 bytes,
see below, hence the ABI is compatible!

However, clang produces a typedef mismatch.

Fix includes the Khronos derived (JOGL) glcorearb.h before cl_gl.h,
hence favors the former 'canonical' definition.

+++

OSX 10.10 32bit:
  sizeof int: 4
  sizeof long: 4
  sizeof long long: 8
  sizeof intptr_t: 4
  sizeof uintptr_t: 4
  sizeof ptrdiff_t: 4
  sizeof size_t: 4
  sizeof float: 4
  sizeof double: 8
  sizeof long double: 16

OSX 10.10 64bit:
  sizeof int: 4
  sizeof long: 8
  sizeof long long: 8
  sizeof intptr_t: 8
  sizeof uintptr_t: 8
  sizeof ptrdiff_t: 8
  sizeof size_t: 8
  sizeof float: 4
  sizeof double: 8
  sizeof long double: 16

2 years agoRemove obsolete Netbeans build files
Wade Walker [Sun, 12 Jul 2015 19:27:00 +0000 (14:27 -0500)]
Remove obsolete Netbeans build files

The new Jogamp standard Ant build has been working correctly for a while
now, so we can delete the old Netbeans build files safely.

2 years agoRemove stub includes that are duplicates of gluegen's and jogl's
Wade Walker [Sun, 12 Jul 2015 19:24:15 +0000 (14:24 -0500)]
Remove stub includes that are duplicates of gluegen's and jogl's

Removes jocl stub includes that are already defined in gluegen and jogl,
and refers to those in gluegen and jogl instead. Requires the
literalInclude parameter to the gluegen Ant task, since it must now
refer to files outside the jocl project.

2 years agoAdd debug targets to match those in gluegen and jogl
Wade Walker [Mon, 6 Jul 2015 20:09:55 +0000 (15:09 -0500)]
Add debug targets to match those in gluegen and jogl

2 years agoGLhandleARB set to void * on OS X, unsigned int everywhere else
Wade Walker [Sun, 5 Jul 2015 14:53:06 +0000 (09:53 -0500)]
GLhandleARB set to void * on OS X, unsigned int everywhere else

The OpenCL headers on OS X include gltypes.h, which defines
GLhandleARB as void *, but the stub headers gl3.h and glext.h
in JOCL were defining it as unsigned int. Put in a typedef
to match how Khronos fixes the problem. See
http://sourceforge.net/p/glew/bugs/206/,
https://bitbucket.org/alfonse/glloadgen/issue/33/mac-compilation-error,
https://www.opengl.org/registry/api/GL/glext.h, and
https://www.khronos.org/bugzilla/show_bug.cgi?id=762 for more
information.

2 years agoAdapt to GlueGen commit 5ca2db226e23c61339943f981a3f46300818cb9a (Use containingJType... v2.3.1
Sven Gothel [Fri, 27 Mar 2015 11:14:24 +0000 (12:14 +0100)]
Adapt to GlueGen commit 5ca2db226e23c61339943f981a3f46300818cb9a (Use containingJTypeName for struct config)

2 years agoAdapt to GlueGen commit 454fac44efd1728d8f5c09ed4abd4041f6187e44: RenameJavaMethod... v2.3.0
Sven Gothel [Wed, 11 Mar 2015 07:53:00 +0000 (08:53 +0100)]
Adapt to GlueGen commit 454fac44efd1728d8f5c09ed4abd4041f6187e44: RenameJavaMethod -> RenameJavaSymbol

2 years agoAdd javadoc arg (property 'javadoc.xarg1') '-Xdoclint:none' if java >= 1.8 (GlueGen...
Sven Gothel [Tue, 3 Feb 2015 02:17:43 +0000 (03:17 +0100)]
Add javadoc arg (property 'javadoc.xarg1') '-Xdoclint:none' if java >= 1.8 (GlueGen commit d8dff4c9f2186749b167195eeb339c33f56864e8)

2 years agoAdapt APK install scripts for harmonized os.and.arch names, see GlueGen commit 3b43a2...
Sven Gothel [Mon, 2 Feb 2015 23:26:33 +0000 (00:26 +0100)]
Adapt APK install scripts for harmonized os.and.arch names, see GlueGen commit 3b43a223253176731567c6d8b7a67c9a6110782b

2 years agoBug 682 - Relocating javax.media.opengl.* -> com.jogamp.opengl.*
Sven Gothel [Mon, 2 Feb 2015 01:51:01 +0000 (02:51 +0100)]
Bug 682 - Relocating javax.media.opengl.* -> com.jogamp.opengl.*

2 years agoBug 1122 - Add ARM 64bit build support, add Android ARM 64 bit build (build/install...
Sven Gothel [Mon, 2 Feb 2015 00:03:43 +0000 (01:03 +0100)]
Bug 1122 - Add ARM 64bit build support, add Android ARM 64 bit build (build/install scripts only)

2 years agoBug 1124 - Android Build: Use SDK >= 24.0.2 (build-tools >= 21.1.2) and NDK >= 10d
Sven Gothel [Wed, 28 Jan 2015 01:09:56 +0000 (02:09 +0100)]
Bug 1124 - Android Build: Use SDK >= 24.0.2 (build-tools >= 21.1.2) and NDK >= 10d

3 years agoBug 978: UITestCase shall only report 'not available on this machine', due to commit... b22x v2.2.1 v2.2.2 v2.2.3 v2.2.4
Sven Gothel [Wed, 3 Sep 2014 01:23:21 +0000 (03:23 +0200)]
Bug 978: UITestCase shall only report 'not available on this machine', due to commit c720767642618cfb4f3739dc6962cde0465e25c5

Giving the OS type leads to misconception that is may not be available on all machines of this OS type.

3 years agoBug 978: Promote CLAbstractImpl.isAvailable() to CLPlatform, public API. isAvailable...
Sven Gothel [Wed, 3 Sep 2014 01:16:10 +0000 (03:16 +0200)]
Bug 978: Promote CLAbstractImpl.isAvailable() to CLPlatform, public API. isAvailable() simply shall return true if JOCL/OpenCL libs could be loaded.

- Promote CLAbstractImpl.isAvailable() to CLPlatform, public API.

- CLAbstractImpl.isAvailable() simply shall return true if JOCL/OpenCL libs could be loaded.

3 years agoFix Eclipse .classpath: build/gensrc/java replaced w/ simple src attachment w/o attribute
Sven Gothel [Mon, 1 Sep 2014 13:59:01 +0000 (15:59 +0200)]
Fix Eclipse .classpath: build/gensrc/java replaced w/ simple src attachment w/o attribute

3 years agoBug 1057: Analyze CLProgramTest freeze on Win 8.1 Intel i7-4770T CPU / HD Graphics...
Sven Gothel [Mon, 1 Sep 2014 13:45:41 +0000 (15:45 +0200)]
Bug 1057: Analyze CLProgramTest freeze on Win 8.1 Intel i7-4770T CPU / HD Graphics 4600

- Properly enforce test order (alphanumeric)

- Split builderTest() to synchronized and async tests

3 years agoScripts: Bump to java 1.8.0_20
Sven Gothel [Sun, 31 Aug 2014 19:17:58 +0000 (21:17 +0200)]
Scripts: Bump to java 1.8.0_20

3 years agoScripts: Bump to java 1.7.0_67 and apache-ant 1.9.4
Sven Gothel [Thu, 28 Aug 2014 05:00:13 +0000 (07:00 +0200)]
Scripts: Bump to java 1.7.0_67 and apache-ant 1.9.4

3 years agoBug 1024: Add fallback for native-jar-file location via classpath v2.2.0
Sven Gothel [Fri, 11 Jul 2014 01:13:08 +0000 (03:13 +0200)]
Bug 1024: Add fallback for native-jar-file location via classpath

Adapt to GlueGen commit f5c48efcf546ba4e08e197ccced6df83b57e1755

3 years agoBug 1023/Bug 1024: Create native jar files for different configurations due to non...
Sven Gothel [Thu, 10 Jul 2014 15:27:44 +0000 (17:27 +0200)]
Bug 1023/Bug 1024: Create native jar files for different configurations due to non-native-jar aliasing

3 years agoBug 1023, Bug 1024: Adapt to GlueGen commit 46faa59d439ef235d7691fc64d56eedc600ffa1a
Sven Gothel [Sat, 5 Jul 2014 13:25:07 +0000 (15:25 +0200)]
Bug 1023, Bug 1024: Adapt to GlueGen commit 46faa59d439ef235d7691fc64d56eedc600ffa1a

3 years agoCode Clean-Up based on our Recommended Settings (jogamp-scripting c47bc86ae2ee268a1f3...
Sven Gothel [Thu, 3 Jul 2014 14:35:47 +0000 (16:35 +0200)]
Code Clean-Up based on our Recommended Settings (jogamp-scripting c47bc86ae2ee268a1f38c5580d11f93d7f8d6e74)

- Change non static accesses to static members using declaring type
    - Change indirect accesses to static members to direct accesses (accesses through subtypes)
    - Add final modifier to private fields
    - Add final modifier to method parameters
    - Add final modifier to local variables
    - Remove unnecessary casts
    - Remove unnecessary '$NON-NLS$' tags
    - Remove trailing white spaces on all lines

3 years agoAdd System.err log if CL/JNI library could not be loaded
Sven Gothel [Wed, 25 Jun 2014 10:48:25 +0000 (12:48 +0200)]
Add System.err log if CL/JNI library could not be loaded

3 years agoAdapt to GlueGen commit 9ee44e1a289ecbac024662dd5a2ffc42e8add023 (Bug 1025)
Sven Gothel [Wed, 25 Jun 2014 08:19:25 +0000 (10:19 +0200)]
Adapt to GlueGen commit 9ee44e1a289ecbac024662dd5a2ffc42e8add023 (Bug 1025)

3 years agoAdapt to GlueGen commit 2f6586292cd298bbc19d8acda0f7cf303c82078b (compount call-by...
Sven Gothel [Wed, 18 Jun 2014 01:55:00 +0000 (03:55 +0200)]
Adapt to GlueGen commit 2f6586292cd298bbc19d8acda0f7cf303c82078b (compount call-by-value extension)

- initializeImpl() is no more required, since it's not forced .. uncomment in manual static initializer

3 years agoAdapt to GlueGen commit c3054a01990e55ab35756ea23ab7d7c05f24dd37 (compount call-by...
Sven Gothel [Tue, 17 Jun 2014 01:32:45 +0000 (03:32 +0200)]
Adapt to GlueGen commit c3054a01990e55ab35756ea23ab7d7c05f24dd37 (compount call-by-value extension)

3 years agoMerge remote-tracking branch 'wwalker/master'
Sven Gothel [Fri, 9 May 2014 23:34:35 +0000 (01:34 +0200)]
Merge remote-tracking branch 'wwalker/master'

3 years agoBug 978: Promote whether a test shall fail due to unavailable CL driver in base UITes...
Sven Gothel [Fri, 9 May 2014 23:32:15 +0000 (01:32 +0200)]
Bug 978: Promote whether a test shall fail due to unavailable CL driver in base UITest class.

3 years agoignore all build* folders
Sven Gothel [Fri, 9 May 2014 23:29:33 +0000 (01:29 +0200)]
ignore all build* folders

3 years agounit test: preserve hs_err_pid*.log files (move to results folder for archive)
Sven Gothel [Fri, 9 May 2014 21:43:13 +0000 (23:43 +0200)]
unit test: preserve hs_err_pid*.log files (move to results folder for archive)

3 years agoFix build instructions
Wade Walker [Sat, 26 Apr 2014 19:40:03 +0000 (14:40 -0500)]
Fix build instructions

Fixed the build instructions to reflect the changes that bring
JOCL into line with the other JogAmp modules. Also fixed dead
links and updated the version of OpenCL we point to.

3 years agoMerge branch 'bug_1003_add_texture_interop_test'
Wade Walker [Sun, 13 Apr 2014 21:52:01 +0000 (16:52 -0500)]
Merge branch 'bug_1003_add_texture_interop_test'

3 years agoFix direct buffer usage in lowLevelVectorAddTest
Wade Walker [Sun, 13 Apr 2014 21:04:16 +0000 (16:04 -0500)]
Fix direct buffer usage in lowLevelVectorAddTest

Increase buffer size and rewind before reuse in every possible
place. This is to try to remove a couple of remaining failures on
some platforms. The failure causes an abnormal JVM exit without
a stack trace when System.gc() is called during teardown.

3 years agoFix transposed arguments in putCopyBufferRect
Wade Walker [Mon, 7 Apr 2014 20:12:50 +0000 (15:12 -0500)]
Fix transposed arguments in putCopyBufferRect

Fixes transposed arguments in CLCommandQueue:putCopyBufferRect.

3 years agoFix CL-GL interoperability tests on Mac.
Wade Walker [Sun, 6 Apr 2014 20:05:46 +0000 (15:05 -0500)]
Fix CL-GL interoperability tests on Mac.

Fixed detection of compatible interoperability platforms (was silently
skipping platform because GL vendor was Nvidia, but CL vendor was
Apple). Also fixed CL kernel syntax error about signed-unsigned
comparison that ATI's driver on Windows didn't find, and fixed the CL
memory object to be write-only instead of read-only (which ATI's Windows
driver just ignored).

3 years agoFinish texture sharing test.
Wade Walker [Sun, 6 Apr 2014 19:20:19 +0000 (14:20 -0500)]
Finish texture sharing test.

Make the test modify a GL texture with a CL kernel, then loop over the
texture afterwards to check each texel has the right value. Also make
the test loop over all platforms and devices that support sharing.

3 years agoStart adding texture interop test.
Wade Walker [Fri, 4 Apr 2014 20:55:35 +0000 (15:55 -0500)]
Start adding texture interop test.

The test here is still not complete, just checking in so I can switch
branches.

3 years agoUse gluegen's JUnit in Eclipse
Wade Walker [Fri, 4 Apr 2014 20:53:49 +0000 (15:53 -0500)]
Use gluegen's JUnit in Eclipse

This fixes problems when Eclipse's default JUnit is too old for our code.

3 years agoFix crashes due to AMD driver bugs.
Wade Walker [Sat, 8 Mar 2014 22:17:36 +0000 (16:17 -0600)]
Fix crashes due to AMD driver bugs.

programBinariesTest() failure was due to AMD drivers crashing
in clCreateKernelsInProgram() when the program is not built yet,
instead of returning error code CL_INVALID_PROGRAM_EXECUTABLE as they
should.

lowLevelVectorAddTest() failure was apparently due to the AMD drivers
writing past the end of a direct byte buffer in such a way that it made
System.gc() crash when called during teardown (this crash didn't even
dump stack). Making the buffer larger solved the problem.

3 years agoRemove Java lint warnings.
Wade Walker [Fri, 7 Mar 2014 22:32:48 +0000 (16:32 -0600)]
Remove Java lint warnings.

Remove all Java lint warnings, by fixing the code if possible, and if
not possible then by inserting @SuppressWarnings. Some of these
@SuppressWarnings can be replaced later with @SafeVarargs if we
eventually drop support for Java 6.

3 years agoRemove warnings, turn on linting, fix Eclipse.
Wade Walker [Fri, 7 Mar 2014 22:28:41 +0000 (16:28 -0600)]
Remove warnings, turn on linting, fix Eclipse.

Removed warnings due to memoryMaximumSize being ignored when javac isn't
forked. Turned on all linting. Changed the arguments of
uncomment-function-params so it will run from within Eclipse properly
(using basedir instead of user.dir, since only the former will be
properly set both inside Eclipse and on the command line).

3 years agoRemove alignment warning in gluegen preprocessing.
Wade Walker [Wed, 5 Mar 2014 22:10:56 +0000 (16:10 -0600)]
Remove alignment warning in gluegen preprocessing.

Turns off the warning about CL_ALIGNED not being
defined for the current compiler, but only inside
the gluegen preprocessor. If CL_ALIGNED isn't
defined for the real C compiler on the platform,
the warning will still show up during C compilation.

3 years agoRemove unnamed struct emission warnings.
Wade Walker [Wed, 5 Mar 2014 20:49:54 +0000 (14:49 -0600)]
Remove unnamed struct emission warnings.

Uses the new augmentation of gluegen's Ignore keyword.

3 years agoPass function pointers into clEnqueueMapImage.
Wade Walker [Sun, 2 Mar 2014 20:02:25 +0000 (14:02 -0600)]
Pass function pointers into clEnqueueMapImage.

These pointers were showing up as uninitialized variables; on inspection
they just weren't being passed in from the Java side or assigned on
the C side. There are currently no tests of this function, which is how
we didn't notice this omission.

3 years agoLoad jocl.properties if present.
Wade Walker [Sun, 2 Mar 2014 18:41:48 +0000 (12:41 -0600)]
Load jocl.properties if present.

This lets us build with debug information turned on.

3 years agoFix C build warnings.
Wade Walker [Sun, 2 Mar 2014 18:16:42 +0000 (12:16 -0600)]
Fix C build warnings.

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.

3 years agoMerge remote-tracking branch 'jogamporg/master'
Wade Walker [Tue, 25 Feb 2014 22:02:12 +0000 (16:02 -0600)]
Merge remote-tracking branch 'jogamporg/master'

3 years agoFix new subBufferTest02FloatBuffer() test on Solaris. v2.1.5
Wade Walker [Tue, 25 Feb 2014 20:56:33 +0000 (14:56 -0600)]
Fix new subBufferTest02FloatBuffer() test on Solaris.

The new OpenCL isAvailable() didn't make it into this test due to
a merge slipup.

Change-Id: I049388908b8f2f2869cc018dbf6be86d1a8dcb9d

3 years agoMerge remote-tracking branch 'personal/bug_978_fix_solaris_tests'
Wade Walker [Tue, 25 Feb 2014 15:20:55 +0000 (09:20 -0600)]
Merge remote-tracking branch 'personal/bug_978_fix_solaris_tests'

3 years agoMerge pull request #5 from WadeWalker/bug_978_fix_solaris_tests
Wade Walker [Tue, 25 Feb 2014 01:43:43 +0000 (19:43 -0600)]
Merge pull request #5 from WadeWalker/bug_978_fix_solaris_tests

Fix OpenCL test failures on Solaris for bug 978.

3 years agoFix OpenCL test failures on Solaris.
Wade Walker [Mon, 24 Feb 2014 00:23:57 +0000 (18:23 -0600)]
Fix OpenCL test failures on Solaris.

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.

3 years agoMerge remote-tracking branch 'wwalker/fix_jocl_bug_981_out_of_direct_buffer_memory'
Sven Gothel [Sat, 22 Feb 2014 22:57:48 +0000 (23:57 +0100)]
Merge remote-tracking branch 'wwalker/fix_jocl_bug_981_out_of_direct_buffer_memory'

3 years agoFix memory problems in High/LowLevelBindingTests.
Wade Walker [Sat, 22 Feb 2014 20:28:40 +0000 (14:28 -0600)]
Fix memory problems in High/LowLevelBindingTests.

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.

3 years agoMinor editing: Remove static imports, using 'final' add some '@XXX' decorations to...
Sven Gothel [Fri, 21 Feb 2014 07:38:35 +0000 (08:38 +0100)]
Minor editing: Remove static imports, using 'final' add some '@XXX' decorations to remove warnings.

Note 'static import' is evil .. :)

3 years agoBug 979: Add 'CL_DEVICE_MEM_BASE_ADDR_ALIGN' to CLDevice and overal maximum to CLCont...
Sven Gothel [Fri, 21 Feb 2014 07:37:26 +0000 (08:37 +0100)]
Bug 979: Add 'CL_DEVICE_MEM_BASE_ADDR_ALIGN' to CLDevice and overal maximum to CLContext - Split CLBufferTest and use alignment.

See Bug 979 for remaining issues and discussion.

3 years agoFix build.xml (regression): Re-activate 'generate.jdk6.autocloseable, generate.jdk7...
Sven Gothel [Fri, 21 Feb 2014 04:43:01 +0000 (05:43 +0100)]
Fix build.xml (regression): Re-activate 'generate.jdk6.autocloseable, generate.jdk7.autocloseable' in java.generate.impl

Regression of commit 46cc6ebfb2f53daebceb9a36b553ff01af56999f

3 years agobuild.xml: Don't re-generate source (gluegen) if CLAbstractImpl_JNI.c uptodate (use...
Sven Gothel [Mon, 17 Feb 2014 04:03:54 +0000 (05:03 +0100)]
build.xml: Don't re-generate source (gluegen) if CLAbstractImpl_JNI.c uptodate (use java.generate.skip); Put native code on gensrc/native/jocl

3 years agoFix Bug 920 - JOCL does not work on windows with 32 bit vm (2/2)
Sven Gothel [Mon, 17 Feb 2014 01:56:57 +0000 (02:56 +0100)]
Fix Bug 920 - JOCL does not work on windows with 32 bit vm (2/2)

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!

3 years agoFix Bug 920 - JOCL does not work on windows with 32 bit vm (1/2)
Sven Gothel [Mon, 17 Feb 2014 01:30:52 +0000 (02:30 +0100)]
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 ..

3 years agoFix windows test scripts (CP, D_ARGS, ..)
Sven Gothel [Mon, 17 Feb 2014 00:15:41 +0000 (01:15 +0100)]
Fix windows test scripts (CP, D_ARGS, ..)

3 years agoFix build.xml: Remove gluegen config dependency on ../build using build-temp
Sven Gothel [Mon, 17 Feb 2014 00:00:03 +0000 (01:00 +0100)]
Fix build.xml: Remove gluegen config dependency on ../build using build-temp

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}.

3 years agoWindows build scripts: Bump ant to 1.8.2
Sven Gothel [Sun, 16 Feb 2014 23:54:52 +0000 (00:54 +0100)]
Windows build scripts: Bump ant to 1.8.2

3 years agoscript: set exec flag
Sven Gothel [Sat, 15 Feb 2014 06:28:48 +0000 (07:28 +0100)]
script: set exec flag

3 years agoFix build scripts
Sven Gothel [Sat, 15 Feb 2014 06:28:20 +0000 (07:28 +0100)]
Fix build scripts

3 years agoAdd scripts/check-junit.sh to validate local unit tests ..
Sven Gothel [Wed, 12 Feb 2014 02:06:24 +0000 (03:06 +0100)]
Add scripts/check-junit.sh to validate local unit tests ..

3 years agoFix unit test bugs on Mac OS X 64-bit.
Wade Walker [Sat, 8 Feb 2014 20:00:41 +0000 (14:00 -0600)]
Fix unit test bugs on Mac OS X 64-bit.

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.

3 years agoFix javadoc packagenames v2.1.4
Sven Gothel [Fri, 31 Jan 2014 10:08:20 +0000 (11:08 +0100)]
Fix javadoc packagenames

3 years agoMiscUtils: Forgot to change access of package-private to public due to new package...
Sven Gothel [Sun, 26 Jan 2014 04:56:53 +0000 (05:56 +0100)]
MiscUtils: Forgot to change access of package-private to public due to new package location (sorry)

3 years agoRename TestUtils -> MiscUtils (not a test), remove 'main' .. oops
Sven Gothel [Sun, 26 Jan 2014 04:50:59 +0000 (05:50 +0100)]
Rename TestUtils -> MiscUtils (not a test), remove 'main' .. oops

3 years agoUnit Tests: Also test 'Test*' while excluding inner classes
Sven Gothel [Sun, 26 Jan 2014 04:43:04 +0000 (05:43 +0100)]
Unit Tests: Also test 'Test*' while excluding inner classes

3 years agoFix build.xml: Processed CL stub_includes _must_ reside in current folder (make)...
Sven Gothel [Sun, 26 Jan 2014 04:33:34 +0000 (05:33 +0100)]
Fix build.xml: Processed CL stub_includes _must_ reside in current folder (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'.

3 years agoJoclVersionActivity: Dump info on stderr for adb logcat
Sven Gothel [Sun, 26 Jan 2014 02:48:57 +0000 (03:48 +0100)]
JoclVersionActivity: Dump info on stderr for adb logcat

3 years agoAdapt all unit tests to use UITestCase and enforce named unit test order. Added main...
Sven Gothel [Sun, 26 Jan 2014 02:33:17 +0000 (03:33 +0100)]
Adapt all unit tests to use UITestCase and enforce named unit test order. Added main entry and listed in tests.sh for manual test.

3 years agoAdd unit test TestJoclVersion and UITestCase base class for singleton unit tests...
Sven Gothel [Sun, 26 Jan 2014 02:15:47 +0000 (03:15 +0100)]
Add unit test TestJoclVersion and UITestCase base class for singleton unit tests ; Fix setenv-jocl.sh: Add jocl-test.jar

3 years agoCleanup Build: GlueGen config files, stub_includes; Add JoclVersion, Android JoclVers...
Sven Gothel [Sun, 26 Jan 2014 01:14:26 +0000 (02:14 +0100)]
Cleanup Build: GlueGen config files, stub_includes; Add JoclVersion, Android 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.)

3 years agobuild.xml: Fix jogl.build: Use [passed or default] jogl.build as well as rootrel...
Sven Gothel [Sat, 25 Jan 2014 17:49:41 +0000 (18:49 +0100)]
build.xml: Fix jogl.build: Use [passed or default] jogl.build as well as rootrel.build (as gluegen does)

3 years agoAdd '-b${joal.build.number}' to joal.version / archive.name ; Produce jar and apk...
Sven Gothel [Sat, 25 Jan 2014 15:21:15 +0000 (16:21 +0100)]
Add '-b${joal.build.number}' to joal.version / archive.name ; Produce jar and apk files in ${build}/jar (as it was before new build system)

http://JogAmp.org git info: FAQ, tutorial and man pages.