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.

4 files changed, 11 insertions, 11 deletions

diff --git a/src/com/jogamp/opencl/CLPlatform.java b/src/com/jogamp/opencl/CLPlatform.java
index d63f6708..17fbe66f 100644
--- a/src/com/jogamp/opencl/CLPlatform.java
+++ b/src/com/jogamp/opencl/CLPlatform.java
@@ -46,8 +46,8 @@ import com.jogamp.opencl.llb.CLEventBinding;
 import com.jogamp.opencl.llb.CLMemObjBinding;
 import com.jogamp.opencl.spi.CLPlatformInfoAccessor;
 import com.jogamp.opencl.util.CLUtil;
-import com.jogamp.opencl.llb.impl.CLAbstractImpl;
-import com.jogamp.opencl.llb.impl.CLImpl;
+import com.jogamp.opencl.llb.impl.CLAbstractImpl11;
+import com.jogamp.opencl.llb.impl.CLImpl11;
 import com.jogamp.opencl.spi.CLAccessorFactory;
 import com.jogamp.opencl.util.Filter;
 
@@ -145,7 +145,7 @@ public class CLPlatform {
      * @returns true if OpenCL is available on this machine,
      * i.e. all native libraries could be loaded (CL and CL/JNI).
      */
-    public static boolean isAvailable() { return CLAbstractImpl.isAvailable(); }
+    public static boolean isAvailable() { return CLAbstractImpl11.isAvailable(); }
 
     /**
      * Eagerly initializes JOCL. Subsequent calls do nothing.
@@ -176,10 +176,10 @@ public class CLPlatform {
             }
         }
 
-        if( !CLAbstractImpl.isAvailable() ) {
+        if( !CLAbstractImpl11.isAvailable() ) {
             throw new JogampRuntimeException("JOCL is not available");
         }
-        cl = new CLImpl();
+        cl = new CLImpl11();
     }
 
     /**
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;
     }
 
diff --git a/src/com/jogamp/opencl/util/CLInfo.java b/src/com/jogamp/opencl/util/CLInfo.java
index 2dfbb5e9..e6d55b58 100644
--- a/src/com/jogamp/opencl/util/CLInfo.java
+++ b/src/com/jogamp/opencl/util/CLInfo.java
@@ -34,7 +34,7 @@ package com.jogamp.opencl.util;
 import com.jogamp.common.os.Platform;
 import com.jogamp.opencl.CLDevice;
 import com.jogamp.opencl.CLPlatform;
-import com.jogamp.opencl.llb.impl.CLImpl;
+import com.jogamp.opencl.llb.impl.CLImpl11;
 import java.util.Map;
 
 
@@ -58,7 +58,7 @@ public class CLInfo {
 
         // binding
         sb.append("CL_BINDING_UNAVAILABLE_FUNCTIONS: ");
-        sb.append(((CLImpl) CLPlatform.getLowLevelCLInterface()).getAddressTable().getNullPointerFunctions());
+        sb.append(((CLImpl11) CLPlatform.getLowLevelCLInterface()).getAddressTable().getNullPointerFunctions());
         sb.append("\n");
 
         // OpenCL