diff options
author | Wade Walker <[email protected]> | 2015-10-03 15:12:24 -0500 |
---|---|---|
committer | Wade Walker <[email protected]> | 2015-11-08 14:05:31 -0600 |
commit | 37c656e3290ff855e1752f9b8a4b830da3000b85 (patch) | |
tree | 76e0de5d788d0c250c076a481c1d376c2479c005 /make/config | |
parent | 4f45fe8db1b5c3790ef2659995c2065807c3fe74 (diff) |
Remove creation and all references to CL*Binding interfaces
This completes the removal of all CL*Binding interfaces; all tests pass
at this point.
Diffstat (limited to 'make/config')
-rw-r--r-- | make/config/cl-buffer-if.cfg | 13 | ||||
-rw-r--r-- | make/config/cl-context-if.cfg | 23 | ||||
-rw-r--r-- | make/config/cl-device-if.cfg | 12 | ||||
-rw-r--r-- | make/config/cl-event-if.cfg | 17 | ||||
-rw-r--r-- | make/config/cl-if.cfg | 54 | ||||
-rw-r--r-- | make/config/cl-image-if.cfg | 16 | ||||
-rw-r--r-- | make/config/cl-kernel-if.cfg | 12 | ||||
-rw-r--r-- | make/config/cl-mem-if.cfg | 18 | ||||
-rw-r--r-- | make/config/cl-platform-if.cfg | 12 | ||||
-rw-r--r-- | make/config/cl-program-if.cfg | 18 | ||||
-rw-r--r-- | make/config/cl-queue-if.cfg | 12 | ||||
-rw-r--r-- | make/config/cl-sampler-if.cfg | 12 |
12 files changed, 29 insertions, 190 deletions
diff --git a/make/config/cl-buffer-if.cfg b/make/config/cl-buffer-if.cfg deleted file mode 100644 index 197ef54d..00000000 --- a/make/config/cl-buffer-if.cfg +++ /dev/null @@ -1,13 +0,0 @@ -Include cl-common.cfg - -Style InterfaceOnly - -ClassJavadoc CLBufferBinding /** -ClassJavadoc CLBufferBinding * Java bindings to OpenCL buffers. -ClassJavadoc CLBufferBinding * @author Michael Bien, GlueGen, et al. -ClassJavadoc CLBufferBinding */ -JavaClass CLBufferBinding - -Extends CLBufferBinding CLMemObjBinding - -IgnoreNot .*CreateBuffer.*|.*CreateSubBuffer.* diff --git a/make/config/cl-context-if.cfg b/make/config/cl-context-if.cfg deleted file mode 100644 index 0e9a5617..00000000 --- a/make/config/cl-context-if.cfg +++ /dev/null @@ -1,23 +0,0 @@ -Include cl-common.cfg - -Style InterfaceOnly - -Import com.jogamp.opencl.llb.impl.CLImageFormatImpl -Import com.jogamp.opencl.CLErrorHandler - -ClassJavadoc CLContextBinding /** -ClassJavadoc CLContextBinding * Java bindings to OpenCL contexts. -ClassJavadoc CLContextBinding * @author Michael Bien, GlueGen, et al. -ClassJavadoc CLContextBinding */ -JavaClass CLContextBinding - -IgnoreNot clGetSupportedImageFormats.*|.*GetContextInfo.*|.*RetainContext.*|.*ReleaseContext.*|CL_CONTEXT_.* - -#custom implementations -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(PointerBuffer properties, PointerBuffer devices, 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(PointerBuffer properties, long device_type, CLErrorHandler pfn_notify, IntBuffer errcode_ret); diff --git a/make/config/cl-device-if.cfg b/make/config/cl-device-if.cfg deleted file mode 100644 index a32476ca..00000000 --- a/make/config/cl-device-if.cfg +++ /dev/null @@ -1,12 +0,0 @@ -Include cl-common.cfg - -Style InterfaceOnly - -ClassJavadoc CLDeviceBinding /** -ClassJavadoc CLDeviceBinding * Java bindings to OpenCL devices. -ClassJavadoc CLDeviceBinding * @author Michael Bien, GlueGen, et al. -ClassJavadoc CLDeviceBinding */ -JavaClass CLDeviceBinding - -IgnoreNot .*CreateSubDevice.*|.*GetDeviceInfo.*|.*RetainDevice.*|.*ReleaseDevice.*|CL_DEVICE_.*|CL_FP_.*|CL_GLOBAL|CL_LOCAL|CL_READ_.*_CACHE - diff --git a/make/config/cl-event-if.cfg b/make/config/cl-event-if.cfg deleted file mode 100644 index 87b55bfd..00000000 --- a/make/config/cl-event-if.cfg +++ /dev/null @@ -1,17 +0,0 @@ -Include cl-common.cfg - -Style InterfaceOnly - -import com.jogamp.opencl.llb.impl.CLEventCallback - -ClassJavadoc CLEventBinding /** -ClassJavadoc CLEventBinding * Java bindings to OpenCL events. -ClassJavadoc CLEventBinding * @author Michael Bien, GlueGen, et al. -ClassJavadoc CLEventBinding */ -JavaClass CLEventBinding - -IgnoreNot .*CreateUserEvent.*|.*GetEventInfo.*|.*GetEventProfilingInfo.*|.*SetUserEventStatus.*|clWaitForEvents.*|.*RetainEvent.*|.*ReleaseEvent.*|CL_EVENT_.* - -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); diff --git a/make/config/cl-if.cfg b/make/config/cl-if.cfg index 2078123a..d4d600b1 100644 --- a/make/config/cl-if.cfg +++ b/make/config/cl-if.cfg @@ -2,41 +2,45 @@ Include cl-common.cfg Style InterfaceOnly +Import com.jogamp.opencl.llb.impl.CLImageFormatImpl +Import com.jogamp.opencl.CLErrorHandler +Import com.jogamp.opencl.llb.impl.BuildProgramCallback +import com.jogamp.opencl.llb.impl.CLMemObjectDestructorCallback +import com.jogamp.opencl.llb.impl.CLEventCallback + ClassJavadoc CL /** ClassJavadoc CL * Java bindings to OpenCL, the Open Computing Language. ClassJavadoc CL * @author Michael Bien, GlueGen, et al. ClassJavadoc CL */ JavaClass CL -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 ../build/gensrc/java/com/jogamp/opencl/llb/CLContextBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLProgramBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLKernelBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLCommandQueueBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLDeviceBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLMemObjBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLImageBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLBufferBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLSamplerBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLEventBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLPlatformBinding.java - #ignore cl-gl interoperability functions. Interface 'CL' is pure OpenCL. Ignore CL_GL_.*|cl.*GL.*|.*_GL_.* Ignore clCreateContext Ignore clCreateContextFromType Ignore clBuildProgram -Ignore clEnqueueNativeKernel -Ignore clSetEventCallback Ignore clSetMemObjectDestructorCallback +Ignore clSetEventCallback +Ignore clEnqueueNativeKernel + +#custom implementations +CustomJavaCode CL +CustomJavaCode CL /** 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 CL public long clCreateContext(PointerBuffer properties, PointerBuffer devices, CLErrorHandler pfn_notify, IntBuffer errcode_ret); + +CustomJavaCode CL +CustomJavaCode CL /** 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 CL public long clCreateContextFromType(PointerBuffer properties, long device_type, CLErrorHandler pfn_notify, IntBuffer errcode_ret); + +CustomJavaCode CL +CustomJavaCode CL /** 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 CL public int clBuildProgram(long program, int deviceCount, PointerBuffer devices, String options, BuildProgramCallback cb); + +CustomJavaCode CL +CustomJavaCode CL /** 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 CL public int clSetMemObjectDestructorCallback(long memObjID, CLMemObjectDestructorCallback cb); + +CustomJavaCode CL +CustomJavaCode CL /** 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 CL public int clSetEventCallback(long event, int type, CLEventCallback cb); diff --git a/make/config/cl-image-if.cfg b/make/config/cl-image-if.cfg deleted file mode 100644 index 611d1bf2..00000000 --- a/make/config/cl-image-if.cfg +++ /dev/null @@ -1,16 +0,0 @@ -Include cl-common.cfg - -Style InterfaceOnly - -Import com.jogamp.opencl.llb.impl.CLImageFormatImpl - -ClassJavadoc CLImageBinding /** -ClassJavadoc CLImageBinding * Java bindings to OpenCL images. -ClassJavadoc CLImageBinding * @author Michael Bien, GlueGen, et al. -ClassJavadoc CLImageBinding */ -JavaClass CLImageBinding - -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/make/config/cl-kernel-if.cfg b/make/config/cl-kernel-if.cfg deleted file mode 100644 index be9d6aa2..00000000 --- a/make/config/cl-kernel-if.cfg +++ /dev/null @@ -1,12 +0,0 @@ -Include cl-common.cfg - -Style InterfaceOnly - -ClassJavadoc CLKernelBinding /** -ClassJavadoc CLKernelBinding * Java bindings to OpenCL kernels. -ClassJavadoc CLKernelBinding * @author Michael Bien, GlueGen, et al. -ClassJavadoc CLKernelBinding */ -JavaClass CLKernelBinding - -IgnoreNot .*CreateKernel.*|.*GetKernel.*Info.*|.*SetKernel.*|.*RetainKernel.*|.*ReleaseKernel.*|CL_KERNEL_.* - diff --git a/make/config/cl-mem-if.cfg b/make/config/cl-mem-if.cfg deleted file mode 100644 index 11c51d19..00000000 --- a/make/config/cl-mem-if.cfg +++ /dev/null @@ -1,18 +0,0 @@ -Include cl-common.cfg - -Style InterfaceOnly - -import com.jogamp.opencl.llb.impl.CLMemObjectDestructorCallback - -ClassJavadoc CLMemObjBinding /** -ClassJavadoc CLMemObjBinding * Java bindings to OpenCL memory objects. -ClassJavadoc CLMemObjBinding * @author Michael Bien, GlueGen, et al. -ClassJavadoc CLMemObjBinding */ -JavaClass CLMemObjBinding - -IgnoreNot .*GetMemObjectInfo.*|.*RetainMemObject.*|.*ReleaseMemObject.*|CL_MEM_.*|CL_MAP_.* - -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/make/config/cl-platform-if.cfg b/make/config/cl-platform-if.cfg deleted file mode 100644 index 1a355f34..00000000 --- a/make/config/cl-platform-if.cfg +++ /dev/null @@ -1,12 +0,0 @@ -Include cl-common.cfg - -Style InterfaceOnly - -ClassJavadoc CLPlatformBinding /** -ClassJavadoc CLPlatformBinding * Java bindings to OpenCL platforms. -ClassJavadoc CLPlatformBinding * @author Michael Bien, GlueGen, et al. -ClassJavadoc CLPlatformBinding */ -JavaClass CLPlatformBinding - -IgnoreNot .*GetPlatformInfo.*|.*GetDeviceIDs.*|.*GetPlatformIDs.*|CL_PLATFORM_.* - diff --git a/make/config/cl-program-if.cfg b/make/config/cl-program-if.cfg deleted file mode 100644 index 7b72272f..00000000 --- a/make/config/cl-program-if.cfg +++ /dev/null @@ -1,18 +0,0 @@ -Include cl-common.cfg - -Style InterfaceOnly - -Import com.jogamp.opencl.llb.impl.BuildProgramCallback - -ClassJavadoc CLProgramBinding /** -ClassJavadoc CLProgramBinding * Java bindings to OpenCL programs. -ClassJavadoc CLProgramBinding * @author Michael Bien, GlueGen, et al. -ClassJavadoc CLProgramBinding */ -JavaClass CLProgramBinding - -IgnoreNot .*CreateProgramWith.*|.*Program.*Info.*|.*RetainProgram.*|.*ReleaseProgram.*|CL_PROGRAM_.*|CL_BUILD_.* - -#custom implementations -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, PointerBuffer devices, String options, BuildProgramCallback cb); diff --git a/make/config/cl-queue-if.cfg b/make/config/cl-queue-if.cfg deleted file mode 100644 index 171b9332..00000000 --- a/make/config/cl-queue-if.cfg +++ /dev/null @@ -1,12 +0,0 @@ -Include cl-common.cfg - -Style InterfaceOnly - -ClassJavadoc CLCommandQueueBinding /** -ClassJavadoc CLCommandQueueBinding * Java bindings to OpenCL command queues. -ClassJavadoc CLCommandQueueBinding * @author Michael Bien, GlueGen, et al. -ClassJavadoc CLCommandQueueBinding */ -JavaClass CLCommandQueueBinding - -IgnoreNot .*CreateCommandQueue.*|.*GetCommandQueueInfo.*|.*EnqueueRead.*|.*EnqueueWrite.*|.*EnqueueCopy.*|.*EnqueueMap.*|.*EnqueueUnmap.*|.*EnqueueBarrier.*|.*EnqueueNDRange.*|.*EnqueueTask.*|.*EnqueueMarker.*|.*EnqueueWait.*|.*EnqueueMigrate.*|.*RetainCommandQueue.*|.*ReleaseCommandQueue.*|clFinish|clFlush|CL_QUEUE_.*|CL_COMMAND_.*|CL_PROFILING_COMMAND_.* - diff --git a/make/config/cl-sampler-if.cfg b/make/config/cl-sampler-if.cfg deleted file mode 100644 index 5329b7f5..00000000 --- a/make/config/cl-sampler-if.cfg +++ /dev/null @@ -1,12 +0,0 @@ -Include cl-common.cfg - -Style InterfaceOnly - -ClassJavadoc CLSamplerBinding /** -ClassJavadoc CLSamplerBinding * Java bindings to OpenCL sampler objects. -ClassJavadoc CLSamplerBinding * @author Michael Bien, GlueGen, et al. -ClassJavadoc CLSamplerBinding */ -JavaClass CLSamplerBinding - -IgnoreNot .*CreateSampler.*|.*GetSamplerInfo.*|.*RetainSampler.*|.*ReleaseSampler.*|CL_SAMPLER_.*|CL_ADDRESS_.*|CL_FILTER_.* - |