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.

3 files changed, 3 insertions, 279 deletions

diff --git a/src/com/jogamp/opencl/CLPlatform.java b/src/com/jogamp/opencl/CLPlatform.java
index 17fbe66f..f0faa0fb 100644
--- a/src/com/jogamp/opencl/CLPlatform.java
+++ b/src/com/jogamp/opencl/CLPlatform.java
@@ -46,7 +46,6 @@ 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.CLAbstractImpl11;
 import com.jogamp.opencl.llb.impl.CLImpl11;
 import com.jogamp.opencl.spi.CLAccessorFactory;
 import com.jogamp.opencl.util.Filter;
@@ -145,7 +144,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 CLAbstractImpl11.isAvailable(); }
+    public static boolean isAvailable() { return CLImpl11.isAvailable(); }
 
     /**
      * Eagerly initializes JOCL. Subsequent calls do nothing.
@@ -176,7 +175,7 @@ public class CLPlatform {
             }
         }
 
-        if( !CLAbstractImpl11.isAvailable() ) {
+        if( !CLImpl11.isAvailable() ) {
             throw new JogampRuntimeException("JOCL is not available");
         }
         cl = new CLImpl11();
diff --git a/src/com/jogamp/opencl/llb/impl/CLDynamicLibraryBundleInfo.java b/src/com/jogamp/opencl/llb/impl/CLDynamicLibraryBundleInfo.java
index 709b58a3..4f3e682a 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 CLAbstractImpl11.clGetExtensionFunctionAddress(toolGetProcAddressHandle, funcName);
+            return CLImpl11.clGetExtensionFunctionAddress(toolGetProcAddressHandle, funcName);
         }
         return 0; // on libs ..
     }
diff --git a/src/com/jogamp/opencl/llb/impl/CLImpl11.java b/src/com/jogamp/opencl/llb/impl/CLImpl11.java
deleted file mode 100644
index fc335ec8..00000000
--- a/src/com/jogamp/opencl/llb/impl/CLImpl11.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright (c) 2009 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
-
-/*
- * Created on Monday, June 07 2010 at 04:25
- */
-package com.jogamp.opencl.llb.impl;
-
-import com.jogamp.common.nio.PointerBuffer;
-import com.jogamp.common.util.LongLongHashMap;
-import com.jogamp.opencl.CLErrorHandler;
-import com.jogamp.opencl.CLException;
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-
-import static com.jogamp.common.nio.Buffers.*;
-
-/**
- * Java bindings to OpenCL, the Open Computing Language.
- * @author Michael Bien, et al.
- */
-public class CLImpl11 extends CLAbstractImpl11 {
-
-    //maps the context id to its error handler's global object pointer
-    private final LongLongHashMap contextCallbackMap;
-
-    public CLImpl11() {
-        super();
-        this.contextCallbackMap = new LongLongHashMap();
-        this.contextCallbackMap.setKeyNotFoundValue(0);
-    }
-
-    @Override
-    public long clCreateContext(final PointerBuffer properties, final PointerBuffer devices, final CLErrorHandler pfn_notify, final IntBuffer errcode_ret) {
-
-        if (properties != null && !properties.isDirect()) {
-            throw new RuntimeException("Argument \"properties\" was not a direct buffer");
-        }
-
-        if (errcode_ret != null && !errcode_ret.isDirect()) {
-            throw new RuntimeException("Argument \"errcode_ret\" was not a direct buffer");
-        }
-
-        final long address = addressTable._addressof_clCreateContext;
-        if (address == 0) {
-            throw new UnsupportedOperationException("Method not available");
-        }
-
-        final long[] global = new long[1];
-        final long ctx = this.clCreateContext0(
-                properties != null ? properties.getBuffer() : null, getDirectBufferByteOffset(properties),
-                devices != null ? devices.remaining() : 0, devices != null ? devices.getBuffer() : null, getDirectBufferByteOffset(devices),
-                pfn_notify, global, errcode_ret, getDirectBufferByteOffset(errcode_ret), address);
-
-        if (pfn_notify != null && global[0] != 0) {
-            synchronized (contextCallbackMap) {
-                contextCallbackMap.put(ctx, global[0]);
-            }
-        }
-        return ctx;
-    }
-
-    private native long clCreateContext0(Object cl_context_properties, int props_offset, int numDevices, Object devices, int devices_offset, Object pfn_notify, long[] global, Object errcode_ret, int err_offset, long address);
-
-    @Override
-    public long clCreateContextFromType(final PointerBuffer properties, final long device_type, final CLErrorHandler pfn_notify, final IntBuffer errcode_ret) {
-        if (properties != null && !properties.isDirect()) {
-            throw new RuntimeException("Argument \"properties\" was not a direct buffer");
-        }
-
-        if (errcode_ret != null && !errcode_ret.isDirect()) {
-            throw new RuntimeException("Argument \"errcode_ret\" was not a direct buffer");
-        }
-
-        final long address = addressTable._addressof_clCreateContextFromType;
-        if (address == 0) {
-            throw new UnsupportedOperationException("Method not available");
-        }
-
-        final long[] global = new long[1];
-        final long ctx = this.clCreateContextFromType0(
-                properties != null ? properties.getBuffer() : null, getDirectBufferByteOffset(properties),
-                device_type, pfn_notify, global, errcode_ret, getDirectBufferByteOffset(errcode_ret), address);
-
-        if (pfn_notify != null && global[0] != 0) {
-            synchronized (contextCallbackMap) {
-                contextCallbackMap.put(ctx, global[0]);
-            }
-        }
-        return ctx;
-    }
-
-    private native long clCreateContextFromType0(Object properties, int props_offset, long device_type, Object pfn_notify, long[] global, Object errcode_ret, int err_offset, long address);
-
-    @Override
-    public int clReleaseContext(final long context) {
-        long global = 0;
-        synchronized (contextCallbackMap) {
-            global = contextCallbackMap.remove(context);
-        }
-
-        final long address = addressTable._addressof_clReleaseContext;
-        if (address == 0) {
-            throw new UnsupportedOperationException("Method not available");
-        }
-        return clReleaseContextImpl(context, global, address);
-    }
-
-    /** Interface to C language function: <br> <code> int32_t {@native clReleaseContext}(cl_context context); </code>    */
-    public native int clReleaseContextImpl(long context, long global, long address);
-
-    /** Interface to C language function: <br> <code> int32_t clBuildProgram(cl_program, uint32_t, cl_device_id * , const char * , void * ); </code>    */
-    @Override
-    public int clBuildProgram(final long program, final int deviceCount, final PointerBuffer deviceList, final String options, final BuildProgramCallback cb) {
-        if (deviceList != null && !deviceList.isDirect()) {
-            throw new RuntimeException("Argument \"properties\" was not a direct buffer");
-        }
-
-        final long address = addressTable._addressof_clBuildProgram;
-        if (address == 0) {
-            throw new UnsupportedOperationException("Method not available");
-        }
-        return clBuildProgram0(program, deviceCount, deviceList != null ? deviceList.getBuffer() : null,
-                getDirectBufferByteOffset(deviceList), options, cb, address);
-    }
-
-    /** Entry point to C language function: <code> int32_t clBuildProgram(cl_program, uint32_t, cl_device_id * , const char * , void * ); </code>    */
-    private native int clBuildProgram0(long program, int deviceCount, Object deviceList, int deviceListOffset, String options, BuildProgramCallback cb, long address);
-
-
-    @Override
-    public int clSetEventCallback(final long event, final int trigger, final CLEventCallback callback) {
-        final long address = addressTable._addressof_clSetEventCallback;
-        if (address == 0) {
-            throw new UnsupportedOperationException("Method not available");
-        }
-        return clSetEventCallback0(event, trigger, callback, address);
-    }
-
-    private native int clSetEventCallback0(long event, int type, CLEventCallback cb, long address);
-
-
-    @Override
-    public int clSetMemObjectDestructorCallback(final long memObjID, final CLMemObjectDestructorCallback cb) {
-        final long address = addressTable._addressof_clSetMemObjectDestructorCallback;
-        if (address == 0) {
-            throw new UnsupportedOperationException("Method not available");
-        }
-        return clSetMemObjectDestructorCallback0(memObjID, cb, address);
-    }
-
-    private native int clSetMemObjectDestructorCallback0(long memObjID, CLMemObjectDestructorCallback cb, long address);
-
-
-    /** Interface to C language function: <br> <code> void *  {@native clEnqueueMapImage}(cl_command_queue command_queue, cl_mem image, uint32_t blocking_map, uint64_t map_flags, const size_t * , const size_t * , size_t *  image_row_pitch, size_t *  image_slice_pitch, uint32_t num_events_in_wait_list, cl_event *  event_wait_list, cl_event *  event, int32_t *  errcode_ret); </code>
-    @param origin a direct {@link com.jogamp.common.nio.PointerBuffer}
-    @param range a direct {@link com.jogamp.common.nio.PointerBuffer}
-    @param image_row_pitch a direct {@link com.jogamp.common.nio.PointerBuffer}
-    @param image_slice_pitch a direct {@link com.jogamp.common.nio.PointerBuffer}
-    @param event_wait_list a direct {@link com.jogamp.common.nio.PointerBuffer}
-    @param event a direct {@link com.jogamp.common.nio.PointerBuffer}
-    @param errcode_ret a direct {@link java.nio.IntBuffer}   */
-    @Override
-    public ByteBuffer clEnqueueMapImage(final long command_queue, final long image, final int blocking_map, final long map_flags,
-            final PointerBuffer origin, final PointerBuffer range,
-            final PointerBuffer image_row_pitch, final PointerBuffer image_slice_pitch,
-            final int num_events_in_wait_list,
-            final PointerBuffer event_wait_list, final PointerBuffer event, final IntBuffer errcode_ret) {
-
-        if (origin != null && !origin.isDirect()) {
-            throw new CLException("Argument \"origin\" was not a direct buffer");
-        }
-        if (range != null && !range.isDirect()) {
-            throw new CLException("Argument \"range\" was not a direct buffer");
-        }
-        if (image_row_pitch != null && !image_row_pitch.isDirect()) {
-            throw new CLException("Argument \"image_row_pitch\" was not a direct buffer");
-        }
-        if (image_slice_pitch != null && !image_slice_pitch.isDirect()) {
-            throw new CLException("Argument \"image_slice_pitch\" was not a direct buffer");
-        }
-        if (event_wait_list != null && !event_wait_list.isDirect()) {
-            throw new CLException("Argument \"event_wait_list\" was not a direct buffer");
-        }
-        if (event != null && !event.isDirect()) {
-            throw new CLException("Argument \"event\" was not a direct buffer");
-        }
-        if (errcode_ret != null && !errcode_ret.isDirect()) {
-            throw new CLException("Argument \"errcode_ret\" was not a direct buffer");
-        }
-
-        final long getImageInfoAddress = addressTable._addressof_clGetImageInfo;
-        if (getImageInfoAddress == 0) {
-            throw new UnsupportedOperationException("Method not available");
-        }
-        final long mapImageAddress = addressTable._addressof_clEnqueueMapImage;
-        if (mapImageAddress == 0) {
-            throw new UnsupportedOperationException("Method not available");
-        }
-        ByteBuffer _res;
-        _res = clEnqueueMapImage0(command_queue, image, blocking_map, map_flags, origin != null ? origin.getBuffer() : null,
-                getDirectBufferByteOffset(origin), range != null ? range.getBuffer() : null,
-                getDirectBufferByteOffset(range), image_row_pitch != null ? image_row_pitch.getBuffer() : null,
-                getDirectBufferByteOffset(image_row_pitch), image_slice_pitch != null ? image_slice_pitch.getBuffer() : null,
-                getDirectBufferByteOffset(image_slice_pitch), num_events_in_wait_list,
-                event_wait_list != null ? event_wait_list.getBuffer() : null, getDirectBufferByteOffset(event_wait_list),
-                event != null ? event.getBuffer() : null, getDirectBufferByteOffset(event), errcode_ret,
-                getDirectBufferByteOffset(errcode_ret), getImageInfoAddress, mapImageAddress);
-        if (_res == null) {
-            return null;
-        }
-        nativeOrder(_res);
-        return _res;
-    }
-
-    /** Entry point to C language function: <code> void *  {@native clEnqueueMapImage}(cl_command_queue command_queue, cl_mem image, uint32_t blocking_map, uint64_t map_flags, const size_t * , const size_t * , size_t *  image_row_pitch, size_t *  image_slice_pitch, uint32_t num_events_in_wait_list, cl_event *  event_wait_list, cl_event *  event, int32_t *  errcode_ret); </code>
-    @param origin a direct {@link com.jogamp.common.nio.PointerBuffer}
-    @param range a direct {@link com.jogamp.common.nio.PointerBuffer}
-    @param image_row_pitch a direct {@link com.jogamp.common.nio.PointerBuffer}
-    @param image_slice_pitch a direct {@link com.jogamp.common.nio.PointerBuffer}
-    @param event_wait_list a direct {@link com.jogamp.common.nio.PointerBuffer}
-    @param event a direct {@link com.jogamp.common.nio.PointerBuffer}
-    @param errcode_ret a direct {@link java.nio.IntBuffer}   */
-    private native ByteBuffer clEnqueueMapImage0(long command_queue, long image, int blocking_map, long map_flags,
-            Object origin, int origin_byte_offset, Object range, int range_byte_offset, Object image_row_pitch,
-            int image_row_pitch_byte_offset, Object image_slice_pitch, int image_slice_pitch_byte_offset,
-            int num_events_in_wait_list, Object event_wait_list, int event_wait_list_byte_offset, Object event,
-            int event_byte_offset, Object errcode_ret, int errcode_ret_byte_offset,
-            long getImageInfoAddress, long mapImageAddress);
-
-    public CLProcAddressTable11 getAddressTable() {
-        return addressTable;
-    }
-
-    /*
-    private static void convert32To64(long[] values) {
-    if (values.length % 2 == 1) {
-    values[values.length - 1] = values[values.length / 2] >>> 32;
-    }
-    for (int i = values.length - 1 - values.length % 2; i >= 0; i -= 2) {
-    long temp = values[i / 2];
-    values[i - 1] = temp >>> 32;
-    values[i] = temp & 0x00000000FFFFFFFFL;
-    }
-    }
-     */
-
-
-
-}