From a444a384b808e423f2e8377ff14c69b0c4be043a Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Fri, 27 May 2011 03:00:12 +0200 Subject: LLB refactoring. - split up CL into multiple sub interfaces - seperation is now feature wise - introdused llb package for low level classes --- resources/cl-buffer-if.cfg | 13 ++++++++++ resources/cl-common.cfg | 4 +-- resources/cl-context-if.cfg | 23 +++++++++++++++++ resources/cl-device-if.cfg | 12 +++++++++ resources/cl-event-if.cfg | 17 +++++++++++++ resources/cl-if.cfg | 60 +++++++++++++++++++------------------------- resources/cl-image-if.cfg | 16 ++++++++++++ resources/cl-impl.cfg | 6 ++--- resources/cl-kernel-if.cfg | 12 +++++++++ resources/cl-mem-if.cfg | 18 +++++++++++++ resources/cl-platform-if.cfg | 12 +++++++++ resources/cl-program-if.cfg | 18 +++++++++++++ resources/cl-queue-if.cfg | 12 +++++++++ resources/cl-sampler-if.cfg | 12 +++++++++ resources/clImplCustomCode.c | 20 +++++++-------- resources/clgl-if.cfg | 20 +++++++-------- 16 files changed, 216 insertions(+), 59 deletions(-) create mode 100644 resources/cl-buffer-if.cfg create mode 100644 resources/cl-context-if.cfg create mode 100644 resources/cl-device-if.cfg create mode 100644 resources/cl-event-if.cfg create mode 100644 resources/cl-image-if.cfg create mode 100644 resources/cl-kernel-if.cfg create mode 100644 resources/cl-mem-if.cfg create mode 100644 resources/cl-platform-if.cfg create mode 100644 resources/cl-program-if.cfg create mode 100644 resources/cl-queue-if.cfg create mode 100644 resources/cl-sampler-if.cfg (limited to 'resources') diff --git a/resources/cl-buffer-if.cfg b/resources/cl-buffer-if.cfg new file mode 100644 index 00000000..95d5f572 --- /dev/null +++ b/resources/cl-buffer-if.cfg @@ -0,0 +1,13 @@ +Include cl-common.cfg + +Style InterfaceOnly + +ClassJavadoc CLBuffer /** +ClassJavadoc CLBuffer * Java bindings to OpenCL, the Open Computing Language. +ClassJavadoc CLBuffer * @author Michael Bien +ClassJavadoc CLBuffer */ +JavaClass CLBuffer + +Extends CLBuffer CLMemObj + +IgnoreNot .*CreateBuffer.*|.*CreateSubBuffer.* diff --git a/resources/cl-common.cfg b/resources/cl-common.cfg index baac28f8..36c5d66c 100644 --- a/resources/cl-common.cfg +++ b/resources/cl-common.cfg @@ -1,7 +1,7 @@ JavaOutputDir gensrc/java NativeOutputDir gensrc/native -Package com.jogamp.opencl +Package com.jogamp.opencl.llb #map pointers to long as internal representation Opaque long cl_context @@ -98,7 +98,7 @@ NioDirectOnly clGetGLContextInfoKHR #common rename emitted struct accessors #struct cl_image_format RenameJavaType cl_image_format CLImageFormatImpl -StructPackage cl_image_format com.jogamp.opencl.impl +StructPackage cl_image_format com.jogamp.opencl.llb.impl #struct fields ([set|get]+FieldName()) RenameJavaMethod image_channel_order imageChannelOrder diff --git a/resources/cl-context-if.cfg b/resources/cl-context-if.cfg new file mode 100644 index 00000000..ce7fba2d --- /dev/null +++ b/resources/cl-context-if.cfg @@ -0,0 +1,23 @@ +Include cl-common.cfg + +Style InterfaceOnly + +Import com.jogamp.opencl.llb.impl.CLImageFormatImpl +Import com.jogamp.opencl.CLErrorHandler + +ClassJavadoc CLContext /** +ClassJavadoc CLContext * Java bindings to OpenCL, the Open Computing Language. +ClassJavadoc CLContext * @author Michael Bien +ClassJavadoc CLContext */ +JavaClass CLContext + +IgnoreNot clGetSupportedImageFormats.*|.*GetContextInfo.*|.*RetainContext.*|.*ReleaseContext.*|CL_CONTEXT_.* + +#custom implementations +CustomJavaCode CLContext +CustomJavaCode CLContext /** Interface to C language function:
cl_context {@native clCreateContext}(intptr_t * , uint32_t, cl_device_id * , void (*pfn_notify)(const char *, const void *, size_t, void *), void *, int32_t * ); */ +CustomJavaCode CLContext public long clCreateContext(NativeSizeBuffer properties, NativeSizeBuffer devices, CLErrorHandler pfn_notify, IntBuffer errcode_ret); + +CustomJavaCode CLContext +CustomJavaCode CLContext /** Interface to C language function:
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) ; */ +CustomJavaCode CLContext 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 new file mode 100644 index 00000000..fe09a343 --- /dev/null +++ b/resources/cl-device-if.cfg @@ -0,0 +1,12 @@ +Include cl-common.cfg + +Style InterfaceOnly + +ClassJavadoc CLDevice /** +ClassJavadoc CLDevice * Java bindings to OpenCL, the Open Computing Language. +ClassJavadoc CLDevice * @author Michael Bien +ClassJavadoc CLDevice */ +JavaClass CLDevice + +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 new file mode 100644 index 00000000..5d24302f --- /dev/null +++ b/resources/cl-event-if.cfg @@ -0,0 +1,17 @@ +Include cl-common.cfg + +Style InterfaceOnly + +import com.jogamp.opencl.llb.impl.CLEventCallback + +ClassJavadoc CLEvent /** +ClassJavadoc CLEvent * Java bindings to OpenCL, the Open Computing Language. +ClassJavadoc CLEvent * @author Michael Bien +ClassJavadoc CLEvent */ +JavaClass CLEvent + +IgnoreNot .*CreateUserEvent.*|.*GetEventInfo.*|.*GetEventProfilingInfo.*|.*SetUserEventStatus.*|clWaitForEvents.*|.*RetainEvent.*|.*ReleaseEvent.*|CL_EVENT_.* + +CustomJavaCode CLEvent +CustomJavaCode CLEvent /** Interface to C language function:
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); */ +CustomJavaCode CLEvent 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 aa7de799..2b08e86a 100644 --- a/resources/cl-if.cfg +++ b/resources/cl-if.cfg @@ -2,49 +2,41 @@ Include cl-common.cfg Style InterfaceOnly -#imports for all generated java files -Import java.nio.IntBuffer -Import java.nio.LongBuffer -Import com.jogamp.opencl.impl.CLImageFormatImpl -import com.jogamp.opencl.impl.BuildProgramCallback -import com.jogamp.opencl.impl.CLEventCallback -import com.jogamp.opencl.impl.CLMemObjectDestructorCallback - ClassJavadoc CL /** ClassJavadoc CL * Java bindings to OpenCL, the Open Computing Language. ClassJavadoc CL * @author Michael Bien ClassJavadoc CL */ JavaClass CL -#ignore cl-gl interoperability funcions. Interface 'CL' is pure OpenCL. -Ignore CL_GL_.*|cl.*GL.* +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 + +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 + +#ignore cl-gl interoperability functions. Interface 'CL' is pure OpenCL. +Ignore CL_GL_.*|cl.*GL.*|.*_GL_.* -#custom implementations Ignore clCreateContext -CustomJavaCode CL -CustomJavaCode CL /** Interface to C language function:
cl_context {@native clCreateContext}(intptr_t * , uint32_t, cl_device_id * , void (*pfn_notify)(const char *, const void *, size_t, void *), void *, int32_t * ); */ -CustomJavaCode CL public long clCreateContext(NativeSizeBuffer properties, NativeSizeBuffer devices, CLErrorHandler pfn_notify, IntBuffer errcode_ret); - Ignore clCreateContextFromType -CustomJavaCode CL -CustomJavaCode CL /** Interface to C language function:
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) ; */ -CustomJavaCode CL public long clCreateContextFromType(NativeSizeBuffer properties, long device_type, CLErrorHandler pfn_notify, IntBuffer errcode_ret); - Ignore clBuildProgram -CustomJavaCode CL -CustomJavaCode CL /** Interface to C language function:
int32_t {@native clBuildProgram}(cl_program, uint32_t, cl_device_id * , const char * , void (*pfn_notify)(cl_program, void *user_data), void * ); */ -CustomJavaCode CL public int clBuildProgram(long program, int deviceCount, NativeSizeBuffer devices, String options, BuildProgramCallback cb); - +Ignore clEnqueueNativeKernel Ignore clSetEventCallback -CustomJavaCode CL -CustomJavaCode CL /** Interface to C language function:
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); */ -CustomJavaCode CL public int clSetEventCallback(long event, int type, CLEventCallback cb); - Ignore clSetMemObjectDestructorCallback -CustomJavaCode CL -CustomJavaCode CL /** Interface to C language function:
int32_t {@native clSetMemObjectDestructorCallback}(cl_mem memobj, void (CL_CALLBACK *pfn_notify) (cl_mem memobj, void *user_data), void *user_data); */ -CustomJavaCode CL public int clSetMemObjectDestructorCallback(long memObjID, CLMemObjectDestructorCallback cb); - -Ignore clEnqueueNativeKernel -#TODO.. - diff --git a/resources/cl-image-if.cfg b/resources/cl-image-if.cfg new file mode 100644 index 00000000..39814f23 --- /dev/null +++ b/resources/cl-image-if.cfg @@ -0,0 +1,16 @@ +Include cl-common.cfg + +Style InterfaceOnly + +Import com.jogamp.opencl.llb.impl.CLImageFormatImpl + +ClassJavadoc CLImage /** +ClassJavadoc CLImage * Java bindings to OpenCL, the Open Computing Language. +ClassJavadoc CLImage * @author Michael Bien +ClassJavadoc CLImage */ +JavaClass CLImage + +Extends CLImage CLMemObj + +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-impl.cfg b/resources/cl-impl.cfg index 4a34683e..1f9240a2 100644 --- a/resources/cl-impl.cfg +++ b/resources/cl-impl.cfg @@ -3,8 +3,8 @@ Include cl-common.cfg Style ImplOnly #imports for all generated java files -Import com.jogamp.opencl.* -Import com.jogamp.opencl.gl.CLGLI +Import com.jogamp.opencl.llb.* +Import com.jogamp.opencl.llb.gl.CLGL ClassJavadoc CLAbstractImpl /** ClassJavadoc CLAbstractImpl * Java bindings to OpenCL, the Open Computing Language (generated). @@ -13,7 +13,7 @@ ClassJavadoc CLAbstractImpl */ ImplJavaClass CLAbstractImpl AccessControl CLAbstractImpl PUBLIC_ABSTRACT -Implements CLAbstractImpl CLGLI +Implements CLAbstractImpl CLGL EmitProcAddressTable true ProcAddressTableClassName CLProcAddressTable diff --git a/resources/cl-kernel-if.cfg b/resources/cl-kernel-if.cfg new file mode 100644 index 00000000..930160cb --- /dev/null +++ b/resources/cl-kernel-if.cfg @@ -0,0 +1,12 @@ +Include cl-common.cfg + +Style InterfaceOnly + +ClassJavadoc CLKernel /** +ClassJavadoc CLKernel * Java bindings to OpenCL, the Open Computing Language. +ClassJavadoc CLKernel * @author Michael Bien +ClassJavadoc CLKernel */ +JavaClass CLKernel + +IgnoreNot .*CreateKernel.*|.*GetKernel.*Info.*|.*SetKernel.*|.*RetainKernel.*|.*ReleaseKernel.*|CL_KERNEL_.* + diff --git a/resources/cl-mem-if.cfg b/resources/cl-mem-if.cfg new file mode 100644 index 00000000..6efc344d --- /dev/null +++ b/resources/cl-mem-if.cfg @@ -0,0 +1,18 @@ +Include cl-common.cfg + +Style InterfaceOnly + +import com.jogamp.opencl.llb.impl.CLMemObjectDestructorCallback + +ClassJavadoc CLMemObj /** +ClassJavadoc CLMemObj * Java bindings to OpenCL, the Open Computing Language. +ClassJavadoc CLMemObj * @author Michael Bien +ClassJavadoc CLMemObj */ +JavaClass CLMemObj + +IgnoreNot .*GetMemObjectInfo.*|.*RetainMemObject.*|.*ReleaseMemObject.*|CL_MEM_.*|CL_MAP_.* + +CustomJavaCode CLMemObj +CustomJavaCode CLMemObj /** Interface to C language function:
int32_t {@native clSetMemObjectDestructorCallback}(cl_mem memobj, void (CL_CALLBACK *pfn_notify) (cl_mem memobj, void *user_data), void *user_data); */ +CustomJavaCode CLMemObj public int clSetMemObjectDestructorCallback(long memObjID, CLMemObjectDestructorCallback cb); + diff --git a/resources/cl-platform-if.cfg b/resources/cl-platform-if.cfg new file mode 100644 index 00000000..a6a3e763 --- /dev/null +++ b/resources/cl-platform-if.cfg @@ -0,0 +1,12 @@ +Include cl-common.cfg + +Style InterfaceOnly + +ClassJavadoc CLPlatform /** +ClassJavadoc CLPlatform * Java bindings to OpenCL, the Open Computing Language. +ClassJavadoc CLPlatform * @author Michael Bien +ClassJavadoc CLPlatform */ +JavaClass CLPlatform + +IgnoreNot .*GetPlatformInfo.*|.*GetDeviceIDs.*|.*GetPlatformIDs.*|CL_PLATFORM_.* + diff --git a/resources/cl-program-if.cfg b/resources/cl-program-if.cfg new file mode 100644 index 00000000..109430ca --- /dev/null +++ b/resources/cl-program-if.cfg @@ -0,0 +1,18 @@ +Include cl-common.cfg + +Style InterfaceOnly + +Import com.jogamp.opencl.llb.impl.BuildProgramCallback + +ClassJavadoc CLProgram /** +ClassJavadoc CLProgram * Java bindings to OpenCL, the Open Computing Language. +ClassJavadoc CLProgram * @author Michael Bien +ClassJavadoc CLProgram */ +JavaClass CLProgram + +IgnoreNot .*CreateProgramWith.*|.*Program.*Info.*|.*RetainProgram.*|.*ReleaseProgram.*|CL_PROGRAM_.*|CL_BUILD_.* + +#custom implementations +CustomJavaCode CLProgram +CustomJavaCode CLProgram /** Interface to C language function:
int32_t {@native clBuildProgram}(cl_program, uint32_t, cl_device_id * , const char * , void (*pfn_notify)(cl_program, void *user_data), void * ); */ +CustomJavaCode CLProgram 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 new file mode 100644 index 00000000..5576709d --- /dev/null +++ b/resources/cl-queue-if.cfg @@ -0,0 +1,12 @@ +Include cl-common.cfg + +Style InterfaceOnly + +ClassJavadoc CLCommandQueue /** +ClassJavadoc CLCommandQueue * Java bindings to OpenCL, the Open Computing Language. +ClassJavadoc CLCommandQueue * @author Michael Bien +ClassJavadoc CLCommandQueue */ +JavaClass CLCommandQueue + +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 new file mode 100644 index 00000000..3b705c59 --- /dev/null +++ b/resources/cl-sampler-if.cfg @@ -0,0 +1,12 @@ +Include cl-common.cfg + +Style InterfaceOnly + +ClassJavadoc CLSampler /** +ClassJavadoc CLSampler * Java bindings to OpenCL, the Open Computing Language. +ClassJavadoc CLSampler * @author Michael Bien +ClassJavadoc CLSampler */ +JavaClass CLSampler + +IgnoreNot .*CreateSampler.*|.*GetSamplerInfo.*|.*RetainSampler.*|.*ReleaseSampler.*|CL_SAMPLER_.*|CL_ADDRESS_.*|CL_FILTER_.* + diff --git a/resources/clImplCustomCode.c b/resources/clImplCustomCode.c index 789491c6..fba3cb3d 100644 --- a/resources/clImplCustomCode.c +++ b/resources/clImplCustomCode.c @@ -26,10 +26,10 @@ JNI_OnLoad(JavaVM * _jvm, void *reserved) { } // throws ClassNotFoundException (or other reflection stuff) - jclass buildCBClassID = (*env)->FindClass(env, "com/jogamp/opencl/impl/BuildProgramCallback"); + jclass buildCBClassID = (*env)->FindClass(env, "com/jogamp/opencl/llb/impl/BuildProgramCallback"); jclass errorHandlerClassID = (*env)->FindClass(env, "com/jogamp/opencl/CLErrorHandler"); - jclass eventCBClassID = (*env)->FindClass(env, "com/jogamp/opencl/impl/CLEventCallback"); - jclass memObjCBClassID = (*env)->FindClass(env, "com/jogamp/opencl/impl/CLMemObjectDestructorCallback"); + jclass eventCBClassID = (*env)->FindClass(env, "com/jogamp/opencl/llb/impl/CLEventCallback"); + jclass memObjCBClassID = (*env)->FindClass(env, "com/jogamp/opencl/llb/impl/CLMemObjectDestructorCallback"); // throws even more reflection Exceptions // IDs are unique and do not change @@ -123,7 +123,7 @@ CL_CALLBACK void memObjDestructorCallback(cl_mem mem, void * object) { * cl_int * errcode_ret); */ JNIEXPORT jlong JNICALL -Java_com_jogamp_opencl_impl_CLImpl_clCreateContextFromType0(JNIEnv *env, jobject _unused, +Java_com_jogamp_opencl_llb_impl_CLImpl_clCreateContextFromType0(JNIEnv *env, jobject _unused, jobject props, jint props_byte_offset, jlong device_type, jobject cb, jobject global, jobject errcode, jint errcode_byte_offset, jlong procAddress) { cl_context_properties* _props_ptr = NULL; @@ -176,7 +176,7 @@ Java_com_jogamp_opencl_impl_CLImpl_clCreateContextFromType0(JNIEnv *env, jobject * cl_int * errcode_ret ) CL_API_SUFFIX__VERSION_1_0; */ JNIEXPORT jlong JNICALL -Java_com_jogamp_opencl_impl_CLImpl_clCreateContext0(JNIEnv *env, jobject _unused, +Java_com_jogamp_opencl_llb_impl_CLImpl_clCreateContext0(JNIEnv *env, jobject _unused, jobject props, jint props_byte_offset, jint numDevices, jobject deviceList, jint device_type_offset, jobject cb, jobject global, jobject errcode, jint errcode_byte_offset, jlong procAddress) { cl_context_properties* _props_ptr = NULL; @@ -227,7 +227,7 @@ Java_com_jogamp_opencl_impl_CLImpl_clCreateContext0(JNIEnv *env, jobject _unused * C function: int32_t clReleaseContextImpl(cl_context context); */ JNIEXPORT jint JNICALL -Java_com_jogamp_opencl_impl_CLImpl_clReleaseContextImpl(JNIEnv *env, jobject _unused, jlong context, jlong global, jlong procAddress) { +Java_com_jogamp_opencl_llb_impl_CLImpl_clReleaseContextImpl(JNIEnv *env, jobject _unused, jlong context, jlong global, jlong procAddress) { int32_t _res; typedef int32_t (*function)(cl_context); @@ -253,7 +253,7 @@ Java_com_jogamp_opencl_impl_CLImpl_clReleaseContextImpl(JNIEnv *env, jobject _un * void * user_data ) CL_API_SUFFIX__VERSION_1_0; */ JNIEXPORT jint JNICALL -Java_com_jogamp_opencl_impl_CLImpl_clBuildProgram0(JNIEnv *env, jobject _unused, +Java_com_jogamp_opencl_llb_impl_CLImpl_clBuildProgram0(JNIEnv *env, jobject _unused, jlong program, jint deviceCount, jobject deviceList, jint device_type_offset, jstring options, jobject cb, jlong procAddress) { const char* _strchars_options = NULL; @@ -303,7 +303,7 @@ Java_com_jogamp_opencl_impl_CLImpl_clBuildProgram0(JNIEnv *env, jobject _unused, * C function: void * 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); */ JNIEXPORT jobject JNICALL -Java_com_jogamp_opencl_impl_CLImpl_clEnqueueMapImage0__JJIJLjava_lang_Object_2ILjava_lang_Object_2ILjava_lang_Object_2ILjava_lang_Object_2IILjava_lang_Object_2ILjava_lang_Object_2ILjava_lang_Object_2I(JNIEnv *env, jobject _unused, +Java_com_jogamp_opencl_llb_impl_CLImpl_clEnqueueMapImage0__JJIJLjava_lang_Object_2ILjava_lang_Object_2ILjava_lang_Object_2ILjava_lang_Object_2IILjava_lang_Object_2ILjava_lang_Object_2ILjava_lang_Object_2I(JNIEnv *env, jobject _unused, jlong command_queue, jlong image, jint blocking_map, jlong map_flags, jobject origin, jint origin_byte_offset, jobject range, jint range_byte_offset, jobject image_row_pitch, jint image_row_pitch_byte_offset, jobject image_slice_pitch, @@ -380,7 +380,7 @@ Java_com_jogamp_opencl_impl_CLImpl_clEnqueueMapImage0__JJIJLjava_lang_Object_2IL } JNIEXPORT jint JNICALL -Java_com_jogamp_opencl_impl_CLImpl_clSetEventCallback0(JNIEnv *env, jobject _unused, +Java_com_jogamp_opencl_llb_impl_CLImpl_clSetEventCallback0(JNIEnv *env, jobject _unused, jlong event, jint trigger, jobject listener, jlong procAddress) { cl_event _event = event; @@ -396,7 +396,7 @@ Java_com_jogamp_opencl_impl_CLImpl_clSetEventCallback0(JNIEnv *env, jobject _unu } JNIEXPORT jint JNICALL -Java_com_jogamp_opencl_impl_CLImpl_clSetMemObjectDestructorCallback0(JNIEnv *env, jobject _unused, +Java_com_jogamp_opencl_llb_impl_CLImpl_clSetMemObjectDestructorCallback0(JNIEnv *env, jobject _unused, jlong mem, jobject listener, jlong procAddress) { cl_mem _mem = mem; diff --git a/resources/clgl-if.cfg b/resources/clgl-if.cfg index 8e3e5292..2f193c73 100644 --- a/resources/clgl-if.cfg +++ b/resources/clgl-if.cfg @@ -1,23 +1,23 @@ Include cl-common.cfg #overwrite package -Package com.jogamp.opencl.gl +Package com.jogamp.opencl.llb.gl -import com.jogamp.opencl.CL +import com.jogamp.opencl.llb.CL Style InterfaceOnly -ClassJavadoc CLGLI /** -ClassJavadoc CLGLI * Java bindings to OpenCL, the Open Computing Language. -ClassJavadoc CLGLI * OpenGL - OpenCL interoperability. -ClassJavadoc CLGLI * @author Michael Bien -ClassJavadoc CLGLI */ -JavaClass CLGLI +ClassJavadoc CLGL /** +ClassJavadoc CLGL * Java bindings to OpenCL, the Open Computing Language. +ClassJavadoc CLGL * OpenGL - OpenCL interoperability. +ClassJavadoc CLGL * @author Michael Bien +ClassJavadoc CLGL */ +JavaClass CLGL -Extends CLGLI CL +Extends CLGL CL #only include token starting with CL_GL_ and methods containing GL -IgnoreNot CL_GL_.*|cl.*GL.* +IgnoreNot CL_GL_.*|cl.*GL.*|.*_GL_.* #append to generated c files #CustomCCode #include -- cgit v1.2.3