| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
| |
Now all three derive from CL, which is currently 1.1.
|
|
|
|
|
| |
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.
|
|
|
|
| |
This completes the removal of all CL*Binding interfaces; all tests pass
at this point.
|
|
|
| |
In preparation for removing the interfaces themselves
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
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.
|
|
|
|
| |
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.
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
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.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
The new Jogamp standard Ant build has been working correctly for a while
now, so we can delete the old Netbeans build files safely.
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
| |
containingJTypeName for struct config)
|
|
|
|
| |
RenameJavaMethod -> RenameJavaSymbol
|
|
|
|
| |
(GlueGen commit d8dff4c9f2186749b167195eeb339c33f56864e8)
|
|
|
|
| |
commit 3b43a223253176731567c6d8b7a67c9a6110782b
|
| |
|
|
|
|
| |
(build/install scripts only)
|
|
|
|
| |
>= 10d
|
|
|
|
|
|
| |
to commit c720767642618cfb4f3739dc6962cde0465e25c5
Giving the OS type leads to misconception that is may not be available on all machines of this OS type.
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
| |
w/o attribute
|
|
|
|
|
|
|
|
| |
Graphics 4600
- Properly enforce test order (alphanumeric)
- Split builderTest() to synchronized and async tests
|
| |
|
| |
|
|
|
|
| |
Adapt to GlueGen commit f5c48efcf546ba4e08e197ccced6df83b57e1755
|
|
|
|
| |
to non-native-jar aliasing
|
|
|
|
| |
46faa59d439ef235d7691fc64d56eedc600ffa1a
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
| |
|
|
|
|
|
|
| |
call-by-value extension)
- initializeImpl() is no more required, since it's not forced .. uncomment in manual static initializer
|
|
|
|
| |
call-by-value extension)
|
|\ |
|
| |
| |
| |
| |
| |
| | |
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.
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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).
|
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |
| | |
| | |
| | |
| | | |
The test here is still not complete, just checking in so I can switch
branches.
|
| | |
| | |
| | |
| | | |
This fixes problems when Eclipse's default JUnit is too old for our code.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |
| | |
| | |
| | | |
base UITest class.
|
| | | |
|