diff options
| -rw-r--r-- | make/build.xml | 6 | ||||
| -rw-r--r-- | make/config/cl-impl-11.cfg | 9 | ||||
| -rw-r--r-- | make/config/cl-impl-12.cfg | 10 | ||||
| -rw-r--r-- | make/config/cl-impl-20.cfg | 10 |
4 files changed, 23 insertions, 12 deletions
diff --git a/make/build.xml b/make/build.xml index e608d255..f5645759 100644 --- a/make/build.xml +++ b/make/build.xml @@ -410,7 +410,7 @@ <classpath refid="gluegen.classpath" /> </gluegen> - <echo message="Generating CLImpl.java, CLImpl_JNI.c, and CLProcAddressTable.java for OpenCL version 1.1"/> + <echo message="Generating CL11.java, CLImpl11.java, CLImpl11_JNI.c, and CLProcAddressTable11.java for OpenCL version 1.1"/> <gluegen src="${stub.includes}/opencl.h" outputRootDir="${build}" config="${config}/cl-impl-11.cfg" @@ -425,7 +425,7 @@ <include name="${gen.includes.dir}/CL12"/> </dirset> <echo message="OpenCL stub include path for OpenCL version 1.2: ${toString:stub.includes.fileset.all.12}"/> - <echo message="Generating CLImpl.java, CLImpl_JNI.c, and CLProcAddressTable.java for OpenCL version 1.2"/> + <echo message="Generating CL12.java, CLImpl12.java, CLImpl12_JNI.c, and CLProcAddressTable12.java for OpenCL version 1.2"/> <gluegen src="${stub.includes}/opencl.h" outputRootDir="${build}" config="${config}/cl-impl-12.cfg" @@ -440,7 +440,7 @@ <include name="${gen.includes.dir}/CL20"/> </dirset> <echo message="OpenCL stub include path for OpenCL version 2.0: ${toString:stub.includes.fileset.all.20}"/> - <echo message="Generating CLImpl.java, CLImpl_JNI.c, and CLProcAddressTable.java for OpenCL version 2.0"/> + <echo message="Generating CL20.java, CLImpl20.java, CLImpl20_JNI.c, and CLProcAddressTable20.java for OpenCL version 2.0"/> <gluegen src="${stub.includes}/opencl.h" outputRootDir="${build}" config="${config}/cl-impl-20.cfg" diff --git a/make/config/cl-impl-11.cfg b/make/config/cl-impl-11.cfg index 25f3a11b..961492a3 100644 --- a/make/config/cl-impl-11.cfg +++ b/make/config/cl-impl-11.cfg @@ -1,10 +1,11 @@ Include cl-common.cfg NativeOutputDir gensrc/native/jocl11 -Style ImplOnly +Style InterfaceAndImpl #imports for all generated java files -Import com.jogamp.opencl.llb.CL +Import com.jogamp.opencl.llb.impl.CLImageFormatImpl +Import com.jogamp.opencl.llb.CL11 Import java.security.AccessController Import java.security.PrivilegedAction Import com.jogamp.common.nio.PointerBuffer @@ -20,9 +21,11 @@ ClassJavadoc CLImpl11 * Java bindings to OpenCL, the Open Computing Language (g ClassJavadoc CLImpl11 * @author Michael Bien, GlueGen, et al. ClassJavadoc CLImpl11 */ +JavaClass CL11 +Extends CL11 CL + ImplJavaClass CLImpl11 AccessControl CLImpl11 PUBLIC -Implements CLImpl11 CL LocalProcAddressCallingConvention __ALL__ CL_API_CALL diff --git a/make/config/cl-impl-12.cfg b/make/config/cl-impl-12.cfg index c6b875f7..4a441adf 100644 --- a/make/config/cl-impl-12.cfg +++ b/make/config/cl-impl-12.cfg @@ -1,10 +1,12 @@ Include cl-common.cfg NativeOutputDir gensrc/native/jocl12 -Style ImplOnly +Style InterfaceAndImpl #imports for all generated java files -Import com.jogamp.opencl.llb.CL +Import com.jogamp.opencl.llb.impl.CLImageFormatImpl +Import com.jogamp.opencl.llb.impl.CLImageDescImpl +Import com.jogamp.opencl.llb.CL12 Import java.security.AccessController Import java.security.PrivilegedAction Import com.jogamp.common.nio.PointerBuffer @@ -20,9 +22,11 @@ ClassJavadoc CLImpl12 * Java bindings to OpenCL, the Open Computing Language (g ClassJavadoc CLImpl12 * @author Michael Bien, GlueGen, et al. ClassJavadoc CLImpl12 */ +JavaClass CL12 +Extends CL12 CL + ImplJavaClass CLImpl12 AccessControl CLImpl12 PUBLIC -Implements CLImpl12 CL LocalProcAddressCallingConvention __ALL__ CL_API_CALL diff --git a/make/config/cl-impl-20.cfg b/make/config/cl-impl-20.cfg index 145d52b1..380e1de4 100644 --- a/make/config/cl-impl-20.cfg +++ b/make/config/cl-impl-20.cfg @@ -1,10 +1,12 @@ Include cl-common.cfg NativeOutputDir gensrc/native/jocl20 -Style ImplOnly +Style InterfaceAndImpl #imports for all generated java files -Import com.jogamp.opencl.llb.CL +Import com.jogamp.opencl.llb.impl.CLImageFormatImpl +Import com.jogamp.opencl.llb.impl.CLImageDescImpl +Import com.jogamp.opencl.llb.CL20 Import java.security.AccessController Import java.security.PrivilegedAction Import com.jogamp.common.nio.PointerBuffer @@ -20,9 +22,11 @@ ClassJavadoc CLImpl20 * Java bindings to OpenCL, the Open Computing Language (g ClassJavadoc CLImpl20 * @author Michael Bien, GlueGen, et al. ClassJavadoc CLImpl20 */ +JavaClass CL20 +Extends CL20 CL + ImplJavaClass CLImpl20 AccessControl CLImpl20 PUBLIC -Implements CLImpl20 CL LocalProcAddressCallingConvention __ALL__ CL_API_CALL |