From e4e7dc4e7a63206c091cd3288adc6a7346f74191 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Mon, 1 Feb 2010 01:09:18 +0100 Subject: trivial bugfixes, typo and javadoc warning fixes. began to switch to gluegen's libloading infrastructure. added CL extensions accessors to CLPlatform. optimized isFooEnabled() methods for CLCommandQueue. --- resources/cl-common.cfg | 7 +++++++ resources/cl-impl.cfg | 4 ++++ resources/clImplCustomCode.java | 6 +++++- 3 files changed, 16 insertions(+), 1 deletion(-) (limited to 'resources') diff --git a/resources/cl-common.cfg b/resources/cl-common.cfg index 6a42f300..79c2845c 100644 --- a/resources/cl-common.cfg +++ b/resources/cl-common.cfg @@ -26,6 +26,10 @@ Ignore CL_LONG_MAX Ignore CL_LONG_MIN Ignore CL_ULONG_MAX + +#use CLException instead of RunTimeException +RuntimeExceptionType CLException + #enforce client side "good behavior" by generating direct-memory-only bindings for #performance critical functions. #NioDirectOnly __ALL__ @@ -78,6 +82,7 @@ NioDirectOnly clWaitForEvents #extensions NioDirectOnly clGetGLContextInfoKHR + #common rename emitted struct accessors #struct cl_image_format RenameJavaType cl_image_format CLImageFormatImpl @@ -87,10 +92,12 @@ StructPackage cl_image_format com.mbien.opencl.impl RenameJavaMethod image_channel_order imageChannelOrder RenameJavaMethod image_channel_data_type imageChannelDataType + ClassJavadoc CLImageFormatImpl /** ClassJavadoc CLImageFormatImpl * Struct accessor for cl_image_format. ClassJavadoc CLImageFormatImpl * @author Michael Bien ClassJavadoc CLImageFormatImpl */ + # Pick up on-line OpenCL doc and link it with the javadoc TagNativeBinding true \ No newline at end of file diff --git a/resources/cl-impl.cfg b/resources/cl-impl.cfg index ec2718df..ac67e482 100644 --- a/resources/cl-impl.cfg +++ b/resources/cl-impl.cfg @@ -22,6 +22,10 @@ GetProcAddressTableExpr addressTable ProcAddressNameExpr $UpperCase(arg) ForceProcAddressGen clGetGLContextInfoKHR +Unignore clGetExtensionFunctionAddress +#AccessControl clGetExtensionFunctionAddress PACKAGE_PRIVATE +ArgumentIsString clGetExtensionFunctionAddress 0 + #append to generated c files CustomCCode #include CustomCCode #include diff --git a/resources/clImplCustomCode.java b/resources/clImplCustomCode.java index 6ee9193b..814bb219 100644 --- a/resources/clImplCustomCode.java +++ b/resources/clImplCustomCode.java @@ -1,5 +1,9 @@ - CLProcAddressTable addressTable = new CLProcAddressTable(); + final static CLProcAddressTable addressTable = new CLProcAddressTable(); + +// static{ +// ProcAddressHelper.resetProcAddressTable(addressTable, ); +// } public long clCreateContext(PointerBuffer properties, PointerBuffer devices, CreateContextCallback pfn_notify, Object userData, IntBuffer errcode_ret) { -- cgit v1.2.3