renamed binding interfaces so we don't have a conflict with HLB.

12 files changed, 93 insertions, 93 deletions

diff --git a/resources/cl-buffer-if.cfg b/resources/cl-buffer-if.cfg
index ad670250..22306727 100644
--- a/resources/cl-buffer-if.cfg
+++ b/resources/cl-buffer-if.cfg
@@ -2,12 +2,12 @@ Include cl-common.cfg
 
 Style InterfaceOnly
 
-ClassJavadoc CLBuffer /**
-ClassJavadoc CLBuffer  * Java bindings to OpenCL buffers.
-ClassJavadoc CLBuffer  * @author Michael Bien
-ClassJavadoc CLBuffer  */
-JavaClass CLBuffer
+ClassJavadoc CLBufferBinding /**
+ClassJavadoc CLBufferBinding  * Java bindings to OpenCL buffers.
+ClassJavadoc CLBufferBinding  * @author Michael Bien
+ClassJavadoc CLBufferBinding  */
+JavaClass CLBufferBinding
 
-Extends CLBuffer CLMemObj
+Extends CLBufferBinding CLMemObjBinding
 
 IgnoreNot .*CreateBuffer.*|.*CreateSubBuffer.*
diff --git a/resources/cl-context-if.cfg b/resources/cl-context-if.cfg
index 8a12af7d..6095b853 100644
--- a/resources/cl-context-if.cfg
+++ b/resources/cl-context-if.cfg
@@ -5,19 +5,19 @@ Style InterfaceOnly
 Import com.jogamp.opencl.llb.impl.CLImageFormatImpl
 Import com.jogamp.opencl.CLErrorHandler
 
-ClassJavadoc CLContext /**
-ClassJavadoc CLContext  * Java bindings to OpenCL contexts.
-ClassJavadoc CLContext  * @author Michael Bien
-ClassJavadoc CLContext  */
-JavaClass CLContext
+ClassJavadoc CLContextBinding /**
+ClassJavadoc CLContextBinding  * Java bindings to OpenCL contexts.
+ClassJavadoc CLContextBinding  * @author Michael Bien
+ClassJavadoc CLContextBinding  */
+JavaClass CLContextBinding
 
 IgnoreNot clGetSupportedImageFormats.*|.*GetContextInfo.*|.*RetainContext.*|.*ReleaseContext.*|CL_CONTEXT_.*
 
 #custom implementations
-CustomJavaCode CLContext
-CustomJavaCode CLContext  /** Interface to C language function: <br> <code> cl_context {@native clCreateContext}(intptr_t * , uint32_t, cl_device_id * , void (*pfn_notify)(const char *, const void *, size_t, void *), void *, int32_t * ); </code>    */
-CustomJavaCode CLContext  public long clCreateContext(NativeSizeBuffer properties, NativeSizeBuffer devices, CLErrorHandler pfn_notify, IntBuffer errcode_ret);
+CustomJavaCode CLContextBinding
+CustomJavaCode CLContextBinding  /** Interface to C language function: <br> <code> cl_context {@native clCreateContext}(intptr_t * , uint32_t, cl_device_id * , void (*pfn_notify)(const char *, const void *, size_t, void *), void *, int32_t * ); </code>    */
+CustomJavaCode CLContextBinding  public long clCreateContext(NativeSizeBuffer properties, NativeSizeBuffer devices, CLErrorHandler pfn_notify, IntBuffer errcode_ret);
 
-CustomJavaCode CLContext
-CustomJavaCode CLContext  /** Interface to C language function: <br> <code> cl_context {@native clCreateContextFromType}(cl_context_properties *properties, cl_device_type device_type, void (*pfn_notify)(const char *errinfo,  const void *private_info, size_t cb, void *user_data), void *user_data, cl_int *errcode_ret) ; </code>    */
-CustomJavaCode CLContext  public long clCreateContextFromType(NativeSizeBuffer properties, long device_type, CLErrorHandler pfn_notify, IntBuffer errcode_ret);
+CustomJavaCode CLContextBinding
+CustomJavaCode CLContextBinding  /** Interface to C language function: <br> <code> cl_context {@native clCreateContextFromType}(cl_context_properties *properties, cl_device_type device_type, void (*pfn_notify)(const char *errinfo,  const void *private_info, size_t cb, void *user_data), void *user_data, cl_int *errcode_ret) ; </code>    */
+CustomJavaCode CLContextBinding  public long clCreateContextFromType(NativeSizeBuffer properties, long device_type, CLErrorHandler pfn_notify, IntBuffer errcode_ret);
diff --git a/resources/cl-device-if.cfg b/resources/cl-device-if.cfg
index 797d9285..054cbdb8 100644
--- a/resources/cl-device-if.cfg
+++ b/resources/cl-device-if.cfg
@@ -2,11 +2,11 @@ Include cl-common.cfg
 
 Style InterfaceOnly
 
-ClassJavadoc CLDevice /**
-ClassJavadoc CLDevice  * Java bindings to OpenCL devices.
-ClassJavadoc CLDevice  * @author Michael Bien
-ClassJavadoc CLDevice  */
-JavaClass CLDevice
+ClassJavadoc CLDeviceBinding /**
+ClassJavadoc CLDeviceBinding  * Java bindings to OpenCL devices.
+ClassJavadoc CLDeviceBinding  * @author Michael Bien
+ClassJavadoc CLDeviceBinding  */
+JavaClass CLDeviceBinding
 
 IgnoreNot .*CreateSubDevice.*|.*GetDeviceInfo.*|.*RetainDevice.*|.*ReleaseDevice.*|CL_DEVICE_.*|CL_FP_.*|CL_GLOBAL|CL_LOCAL|CL_READ_.*_CACHE
 
diff --git a/resources/cl-event-if.cfg b/resources/cl-event-if.cfg
index 8e0759b1..73a9c772 100644
--- a/resources/cl-event-if.cfg
+++ b/resources/cl-event-if.cfg
@@ -4,14 +4,14 @@ Style InterfaceOnly
 
 import com.jogamp.opencl.llb.impl.CLEventCallback
 
-ClassJavadoc CLEvent /**
-ClassJavadoc CLEvent  * Java bindings to OpenCL events.
-ClassJavadoc CLEvent  * @author Michael Bien
-ClassJavadoc CLEvent  */
-JavaClass CLEvent
+ClassJavadoc CLEventBinding /**
+ClassJavadoc CLEventBinding  * Java bindings to OpenCL events.
+ClassJavadoc CLEventBinding  * @author Michael Bien
+ClassJavadoc CLEventBinding  */
+JavaClass CLEventBinding
 
 IgnoreNot .*CreateUserEvent.*|.*GetEventInfo.*|.*GetEventProfilingInfo.*|.*SetUserEventStatus.*|clWaitForEvents.*|.*RetainEvent.*|.*ReleaseEvent.*|CL_EVENT_.*
 
-CustomJavaCode CLEvent
-CustomJavaCode CLEvent  /** Interface to C language function: <br> <code> int32_t {@native clSetEventCallback}(cl_event event, cl_int command_exec_callback_type, void (CL_CALLBACK  *pfn_event_notify) (cl_event event, cl_int event_command_exec_status, void *user_data), void *user_data); </code>    */
-CustomJavaCode CLEvent  public int clSetEventCallback(long event, int type, CLEventCallback cb);
\ No newline at end of file
+CustomJavaCode CLEventBinding
+CustomJavaCode CLEventBinding  /** Interface to C language function: <br> <code> int32_t {@native clSetEventCallback}(cl_event event, cl_int command_exec_callback_type, void (CL_CALLBACK  *pfn_event_notify) (cl_event event, cl_int event_command_exec_status, void *user_data), void *user_data); </code>    */
+CustomJavaCode CLEventBinding  public int clSetEventCallback(long event, int type, CLEventCallback cb);
\ No newline at end of file
diff --git a/resources/cl-if.cfg b/resources/cl-if.cfg
index 2b08e86a..94c9677e 100644
--- a/resources/cl-if.cfg
+++ b/resources/cl-if.cfg
@@ -8,28 +8,28 @@ ClassJavadoc CL  * @author Michael Bien
 ClassJavadoc CL  */
 JavaClass CL
 
-Extends CL CLContext
-Extends CL CLProgram
-Extends CL CLKernel
-Extends CL CLCommandQueue
-Extends CL CLDevice
-Extends CL CLImage
-Extends CL CLBuffer
-Extends CL CLSampler
-Extends CL CLEvent
-Extends CL CLPlatform
+Extends CL CLContextBinding
+Extends CL CLProgramBinding
+Extends CL CLKernelBinding
+Extends CL CLCommandQueueBinding
+Extends CL CLDeviceBinding
+Extends CL CLImageBinding
+Extends CL CLBufferBinding
+Extends CL CLSamplerBinding
+Extends CL CLEventBinding
+Extends CL CLPlatformBinding
 
-ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLContext.java
-ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLProgram.java
-ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLKernel.java
-ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLCommandQueue.java
-ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLDevice.java
-ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLMemObj.java
-ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLImage.java
-ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLBuffer.java
-ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLSampler.java
-ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLEvent.java
-ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLPlatform.java
+ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLContextBinding.java
+ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLProgramBinding.java
+ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLKernelBinding.java
+ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLCommandQueueBinding.java
+ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLDeviceBinding.java
+ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLMemObjBinding.java
+ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLImageBinding.java
+ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLBufferBinding.java
+ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLSamplerBinding.java
+ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLEventBinding.java
+ExtendedInterfaceSymbolsIgnore gensrc/java/com/jogamp/opencl/llb/CLPlatformBinding.java
 
 #ignore cl-gl interoperability functions. Interface 'CL' is pure OpenCL.
 Ignore CL_GL_.*|cl.*GL.*|.*_GL_.*
diff --git a/resources/cl-image-if.cfg b/resources/cl-image-if.cfg
index e94959ab..7d62834b 100644
--- a/resources/cl-image-if.cfg
+++ b/resources/cl-image-if.cfg
@@ -4,13 +4,13 @@ Style InterfaceOnly
 
 Import com.jogamp.opencl.llb.impl.CLImageFormatImpl
 
-ClassJavadoc CLImage /**
-ClassJavadoc CLImage  * Java bindings to OpenCL images.
-ClassJavadoc CLImage  * @author Michael Bien
-ClassJavadoc CLImage  */
-JavaClass CLImage
+ClassJavadoc CLImageBinding /**
+ClassJavadoc CLImageBinding  * Java bindings to OpenCL images.
+ClassJavadoc CLImageBinding  * @author Michael Bien
+ClassJavadoc CLImageBinding  */
+JavaClass CLImageBinding
 
-Extends CLImage CLMemObj
+Extends CLImageBinding CLMemObjBinding
 
 IgnoreNot .*CreateImage.*|.*GetImageInfo.*|CL_IMAGE_.*|CL_R|CL_Rx|CL_A|CL_RG|CL_RGx|CL_RA|CL_RGB|CL_RGBx|CL_RGBA|CL_ARGB|CL_BGRA|CL_INTENSITY|CL_LUMINANCE|CL_SNORM_INT8|CL_SNORM_INT16|CL_UNORM_INT8|CL_UNORM_INT16|CL_UNORM_SHORT_565|CL_UNORM_SHORT_555|CL_UNORM_INT_101010|CL_SIGNED_INT8|CL_SIGNED_INT16|CL_SIGNED_INT32|CL_UNSIGNED_INT8|CL_UNSIGNED_INT16|CL_UNSIGNED_INT32|CL_HALF_FLOAT|CL_FLOAT
 
diff --git a/resources/cl-kernel-if.cfg b/resources/cl-kernel-if.cfg
index 56c70138..732ab858 100644
--- a/resources/cl-kernel-if.cfg
+++ b/resources/cl-kernel-if.cfg
@@ -2,11 +2,11 @@ Include cl-common.cfg
 
 Style InterfaceOnly
 
-ClassJavadoc CLKernel /**
-ClassJavadoc CLKernel  * Java bindings to OpenCL kernels.
-ClassJavadoc CLKernel  * @author Michael Bien
-ClassJavadoc CLKernel  */
-JavaClass CLKernel
+ClassJavadoc CLKernelBinding /**
+ClassJavadoc CLKernelBinding  * Java bindings to OpenCL kernels.
+ClassJavadoc CLKernelBinding  * @author Michael Bien
+ClassJavadoc CLKernelBinding  */
+JavaClass CLKernelBinding
 
 IgnoreNot .*CreateKernel.*|.*GetKernel.*Info.*|.*SetKernel.*|.*RetainKernel.*|.*ReleaseKernel.*|CL_KERNEL_.*
 
diff --git a/resources/cl-mem-if.cfg b/resources/cl-mem-if.cfg
index 12e3c9cc..aae750e2 100644
--- a/resources/cl-mem-if.cfg
+++ b/resources/cl-mem-if.cfg
@@ -4,15 +4,15 @@ Style InterfaceOnly
 
 import com.jogamp.opencl.llb.impl.CLMemObjectDestructorCallback
 
-ClassJavadoc CLMemObj /**
-ClassJavadoc CLMemObj  * Java bindings to OpenCL memory objects.
-ClassJavadoc CLMemObj  * @author Michael Bien
-ClassJavadoc CLMemObj  */
-JavaClass CLMemObj
+ClassJavadoc CLMemObjBinding /**
+ClassJavadoc CLMemObjBinding  * Java bindings to OpenCL memory objects.
+ClassJavadoc CLMemObjBinding  * @author Michael Bien
+ClassJavadoc CLMemObjBinding  */
+JavaClass CLMemObjBinding
 
 IgnoreNot .*GetMemObjectInfo.*|.*RetainMemObject.*|.*ReleaseMemObject.*|CL_MEM_.*|CL_MAP_.*
 
-CustomJavaCode CLMemObj
-CustomJavaCode CLMemObj  /** Interface to C language function: <br> <code> int32_t {@native clSetMemObjectDestructorCallback}(cl_mem memobj, void (CL_CALLBACK  *pfn_notify) (cl_mem memobj, void *user_data), void *user_data); </code>    */
-CustomJavaCode CLMemObj  public int clSetMemObjectDestructorCallback(long memObjID, CLMemObjectDestructorCallback cb);
+CustomJavaCode CLMemObjBinding
+CustomJavaCode CLMemObjBinding  /** Interface to C language function: <br> <code> int32_t {@native clSetMemObjectDestructorCallback}(cl_mem memobj, void (CL_CALLBACK  *pfn_notify) (cl_mem memobj, void *user_data), void *user_data); </code>    */
+CustomJavaCode CLMemObjBinding  public int clSetMemObjectDestructorCallback(long memObjID, CLMemObjectDestructorCallback cb);
 
diff --git a/resources/cl-platform-if.cfg b/resources/cl-platform-if.cfg
index 72330cce..e66f5bda 100644
--- a/resources/cl-platform-if.cfg
+++ b/resources/cl-platform-if.cfg
@@ -2,11 +2,11 @@ Include cl-common.cfg
 
 Style InterfaceOnly
 
-ClassJavadoc CLPlatform /**
-ClassJavadoc CLPlatform  * Java bindings to OpenCL platforms.
-ClassJavadoc CLPlatform  * @author Michael Bien
-ClassJavadoc CLPlatform  */
-JavaClass CLPlatform
+ClassJavadoc CLPlatformBinding /**
+ClassJavadoc CLPlatformBinding  * Java bindings to OpenCL platforms.
+ClassJavadoc CLPlatformBinding  * @author Michael Bien
+ClassJavadoc CLPlatformBinding  */
+JavaClass CLPlatformBinding
 
 IgnoreNot .*GetPlatformInfo.*|.*GetDeviceIDs.*|.*GetPlatformIDs.*|CL_PLATFORM_.*
 
diff --git a/resources/cl-program-if.cfg b/resources/cl-program-if.cfg
index 16bdc32d..afa593a8 100644
--- a/resources/cl-program-if.cfg
+++ b/resources/cl-program-if.cfg
@@ -4,15 +4,15 @@ Style InterfaceOnly
 
 Import com.jogamp.opencl.llb.impl.BuildProgramCallback
 
-ClassJavadoc CLProgram /**
-ClassJavadoc CLProgram  * Java bindings to OpenCL programs.
-ClassJavadoc CLProgram  * @author Michael Bien
-ClassJavadoc CLProgram  */
-JavaClass CLProgram
+ClassJavadoc CLProgramBinding /**
+ClassJavadoc CLProgramBinding  * Java bindings to OpenCL programs.
+ClassJavadoc CLProgramBinding  * @author Michael Bien
+ClassJavadoc CLProgramBinding  */
+JavaClass CLProgramBinding
 
 IgnoreNot .*CreateProgramWith.*|.*Program.*Info.*|.*RetainProgram.*|.*ReleaseProgram.*|CL_PROGRAM_.*|CL_BUILD_.*
 
 #custom implementations
-CustomJavaCode CLProgram
-CustomJavaCode CLProgram  /** Interface to C language function: <br> <code> int32_t {@native clBuildProgram}(cl_program, uint32_t, cl_device_id * , const char * , void (*pfn_notify)(cl_program, void *user_data), void * ); </code>    */
-CustomJavaCode CLProgram  public int clBuildProgram(long program, int deviceCount, NativeSizeBuffer devices, String options, BuildProgramCallback cb);
+CustomJavaCode CLProgramBinding
+CustomJavaCode CLProgramBinding  /** Interface to C language function: <br> <code> int32_t {@native clBuildProgram}(cl_program, uint32_t, cl_device_id * , const char * , void (*pfn_notify)(cl_program, void *user_data), void * ); </code>    */
+CustomJavaCode CLProgramBinding  public int clBuildProgram(long program, int deviceCount, NativeSizeBuffer devices, String options, BuildProgramCallback cb);
diff --git a/resources/cl-queue-if.cfg b/resources/cl-queue-if.cfg
index 764284b6..1caa6d48 100644
--- a/resources/cl-queue-if.cfg
+++ b/resources/cl-queue-if.cfg
@@ -2,11 +2,11 @@ Include cl-common.cfg
 
 Style InterfaceOnly
 
-ClassJavadoc CLCommandQueue /**
-ClassJavadoc CLCommandQueue  * Java bindings to OpenCL command queues.
-ClassJavadoc CLCommandQueue  * @author Michael Bien
-ClassJavadoc CLCommandQueue  */
-JavaClass CLCommandQueue
+ClassJavadoc CLCommandQueueBinding /**
+ClassJavadoc CLCommandQueueBinding  * Java bindings to OpenCL command queues.
+ClassJavadoc CLCommandQueueBinding  * @author Michael Bien
+ClassJavadoc CLCommandQueueBinding  */
+JavaClass CLCommandQueueBinding
 
 IgnoreNot .*CreateCommandQueue.*|.*GetCommandQueueInfo.*|.*EnqueueRead.*|.*EnqueueWrite.*|.*EnqueueCopy.*|.*EnqueueMap.*|.*EnqueueUnmap.*|.*EnqueueBarrier.*|.*EnqueueNDRange.*|.*EnqueueTask.*|.*EnqueueMarker.*|.*EnqueueWait.*|.*RetainCommandQueue.*|.*ReleaseCommandQueue.*|clFinish|clFlush|CL_QUEUE_.*|CL_COMMAND_.*|CL_PROFILING_COMMAND_.*
 
diff --git a/resources/cl-sampler-if.cfg b/resources/cl-sampler-if.cfg
index b13d0d6f..f6382a59 100644
--- a/resources/cl-sampler-if.cfg
+++ b/resources/cl-sampler-if.cfg
@@ -2,11 +2,11 @@ Include cl-common.cfg
 
 Style InterfaceOnly
 
-ClassJavadoc CLSampler /**
-ClassJavadoc CLSampler  * Java bindings to OpenCL sampler objects.
-ClassJavadoc CLSampler  * @author Michael Bien
-ClassJavadoc CLSampler  */
-JavaClass CLSampler
+ClassJavadoc CLSamplerBinding /**
+ClassJavadoc CLSamplerBinding  * Java bindings to OpenCL sampler objects.
+ClassJavadoc CLSamplerBinding  * @author Michael Bien
+ClassJavadoc CLSamplerBinding  */
+JavaClass CLSamplerBinding
 
 IgnoreNot .*CreateSampler.*|.*GetSamplerInfo.*|.*RetainSampler.*|.*ReleaseSampler.*|CL_SAMPLER_.*|CL_ADDRESS_.*|CL_FILTER_.*