diff options
author | Wade Walker <[email protected]> | 2015-09-12 14:28:16 -0500 |
---|---|---|
committer | Wade Walker <[email protected]> | 2015-11-08 14:05:29 -0600 |
commit | 9a90181ed1fb596275fee9ebca0f3d1093722ca9 (patch) | |
tree | d9fbcc4fbb6c54bae64e5c0160f3a28a2ca0e934 /src/com/jogamp/opencl/llb | |
parent | e56a17d6d7780b8597c78ce50808c8da68d094b5 (diff) |
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.
Diffstat (limited to 'src/com/jogamp/opencl/llb')
-rw-r--r-- | src/com/jogamp/opencl/llb/impl/CLDynamicLibraryBundleInfo.java | 2 | ||||
-rw-r--r-- | src/com/jogamp/opencl/llb/impl/CLImpl11.java (renamed from src/com/jogamp/opencl/llb/impl/CLImpl.java) | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/jogamp/opencl/llb/impl/CLDynamicLibraryBundleInfo.java b/src/com/jogamp/opencl/llb/impl/CLDynamicLibraryBundleInfo.java index 59bb0723..709b58a3 100644 --- a/src/com/jogamp/opencl/llb/impl/CLDynamicLibraryBundleInfo.java +++ b/src/com/jogamp/opencl/llb/impl/CLDynamicLibraryBundleInfo.java @@ -143,7 +143,7 @@ public final class CLDynamicLibraryBundleInfo implements DynamicLibraryBundleInf funcName = funcName.substring(0, funcName.length() - Impl_len); } if( funcName.endsWith("KHR") || funcName.endsWith("EXT") ) { - return CLAbstractImpl.clGetExtensionFunctionAddress(toolGetProcAddressHandle, funcName); + return CLAbstractImpl11.clGetExtensionFunctionAddress(toolGetProcAddressHandle, funcName); } return 0; // on libs .. } diff --git a/src/com/jogamp/opencl/llb/impl/CLImpl.java b/src/com/jogamp/opencl/llb/impl/CLImpl11.java index 6eb9cde5..fc335ec8 100644 --- a/src/com/jogamp/opencl/llb/impl/CLImpl.java +++ b/src/com/jogamp/opencl/llb/impl/CLImpl11.java @@ -44,12 +44,12 @@ import static com.jogamp.common.nio.Buffers.*; * Java bindings to OpenCL, the Open Computing Language. * @author Michael Bien, et al. */ -public class CLImpl extends CLAbstractImpl { +public class CLImpl11 extends CLAbstractImpl11 { //maps the context id to its error handler's global object pointer private final LongLongHashMap contextCallbackMap; - public CLImpl() { + public CLImpl11() { super(); this.contextCallbackMap = new LongLongHashMap(); this.contextCallbackMap.setKeyNotFoundValue(0); @@ -253,7 +253,7 @@ public class CLImpl extends CLAbstractImpl { int event_byte_offset, Object errcode_ret, int errcode_ret_byte_offset, long getImageInfoAddress, long mapImageAddress); - public CLProcAddressTable getAddressTable() { + public CLProcAddressTable11 getAddressTable() { return addressTable; } |