summaryrefslogtreecommitdiffstats
path: root/make/config
diff options
context:
space:
mode:
authorWade Walker <[email protected]>2015-10-04 16:00:01 -0500
committerWade Walker <[email protected]>2015-11-08 14:05:32 -0600
commit050279e6ccd7a3fcc4031730f7e157a3d10e28cb (patch)
tree1d91250eea09320329822afba53e69298b91b249 /make/config
parent0135df38d6ccdf17283a26c9c56adb08a0e6d30e (diff)
Add versioned interfaces for CL 1.1, 1.2, and 2.0
Now all three derive from CL, which is currently 1.1.
Diffstat (limited to 'make/config')
-rw-r--r--make/config/cl-impl-11.cfg9
-rw-r--r--make/config/cl-impl-12.cfg10
-rw-r--r--make/config/cl-impl-20.cfg10
3 files changed, 20 insertions, 9 deletions
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