Remove CLGL interface

This removes the last sub-interface that would have to be separately
versioned for future versions of OpenCL. After this, new OpenCL versions
will only create one new interface and one new implementation.

6 files changed, 12 insertions, 46 deletions

diff --git a/make/build.xml b/make/build.xml
index 24704397..e608d255 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -410,17 +410,6 @@
             <classpath refid="gluegen.classpath" />
         </gluegen>
 
-        <echo message="Generating CLGL.java from OpenCL version 1.1"/>
-        <gluegen src="${stub.includes}/opencl.h"
-                 outputRootDir="${build}"
-                 config="${config}/clgl-if.cfg"
-                 includeRefid="stub.includes.fileset.all.11"
-                 literalInclude="${stub.includes.gluegen.all}"
-                 emitter="com.jogamp.gluegen.JavaEmitter"
-                 debug="false">
-            <classpath refid="gluegen.classpath" />
-        </gluegen>
-
         <echo message="Generating CLImpl.java, CLImpl_JNI.c, and CLProcAddressTable.java for OpenCL version 1.1"/>
         <gluegen src="${stub.includes}/opencl.h"
                  outputRootDir="${build}"
diff --git a/make/config/cl-if.cfg b/make/config/cl-if.cfg
index d4d600b1..b01ab957 100644
--- a/make/config/cl-if.cfg
+++ b/make/config/cl-if.cfg
@@ -14,9 +14,6 @@ ClassJavadoc CL  * @author Michael Bien, GlueGen, et al.
 ClassJavadoc CL  */
 JavaClass CL
 
-#ignore cl-gl interoperability functions. Interface 'CL' is pure OpenCL.
-Ignore CL_GL_.*|cl.*GL.*|.*_GL_.*
-
 Ignore clCreateContext
 Ignore clCreateContextFromType
 Ignore clBuildProgram
@@ -44,3 +41,9 @@ CustomJavaCode CL  public int clSetMemObjectDestructorCallback(long memObjID, CL
 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);
+
+CustomJavaCode CL /** To be used on Mac OSX instead of {@link #CL_CGL_SHAREGROUP_KHR}}. FIXME: For all Mac OSX versions? */
+CustomJavaCode CL public static final int CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE = 0x10000000;
+
+#append to generated c files
+#CustomCCode #include <inttypes.h>
diff --git a/make/config/cl-impl-11.cfg b/make/config/cl-impl-11.cfg
index 34d48424..25f3a11b 100644
--- a/make/config/cl-impl-11.cfg
+++ b/make/config/cl-impl-11.cfg
@@ -4,7 +4,7 @@ NativeOutputDir gensrc/native/jocl11
 Style ImplOnly
 
 #imports for all generated java files
-Import com.jogamp.opencl.llb.gl.CLGL
+Import com.jogamp.opencl.llb.CL
 Import java.security.AccessController
 Import java.security.PrivilegedAction
 Import com.jogamp.common.nio.PointerBuffer
@@ -22,7 +22,7 @@ ClassJavadoc CLImpl11  */
 
 ImplJavaClass CLImpl11
 AccessControl CLImpl11 PUBLIC
-Implements CLImpl11 CLGL
+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 2f8e8dd1..c6b875f7 100644
--- a/make/config/cl-impl-12.cfg
+++ b/make/config/cl-impl-12.cfg
@@ -4,7 +4,7 @@ NativeOutputDir gensrc/native/jocl12
 Style ImplOnly
 
 #imports for all generated java files
-Import com.jogamp.opencl.llb.gl.CLGL
+Import com.jogamp.opencl.llb.CL
 Import java.security.AccessController
 Import java.security.PrivilegedAction
 Import com.jogamp.common.nio.PointerBuffer
@@ -22,7 +22,7 @@ ClassJavadoc CLImpl12  */
 
 ImplJavaClass CLImpl12
 AccessControl CLImpl12 PUBLIC
-Implements CLImpl12 CLGL
+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 8f8358ed..145d52b1 100644
--- a/make/config/cl-impl-20.cfg
+++ b/make/config/cl-impl-20.cfg
@@ -4,7 +4,7 @@ NativeOutputDir gensrc/native/jocl20
 Style ImplOnly
 
 #imports for all generated java files
-Import com.jogamp.opencl.llb.gl.CLGL
+Import com.jogamp.opencl.llb.CL
 Import java.security.AccessController
 Import java.security.PrivilegedAction
 Import com.jogamp.common.nio.PointerBuffer
@@ -22,7 +22,7 @@ ClassJavadoc CLImpl20  */
 
 ImplJavaClass CLImpl20
 AccessControl CLImpl20 PUBLIC
-Implements CLImpl20 CLGL
+Implements CLImpl20 CL
 
 LocalProcAddressCallingConvention __ALL__ CL_API_CALL
 
diff --git a/make/config/clgl-if.cfg b/make/config/clgl-if.cfg
deleted file mode 100644
index 1671f76c..00000000
--- a/make/config/clgl-if.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-Include cl-common.cfg
-
-#overwrite package
-Package com.jogamp.opencl.llb.gl
-
-import com.jogamp.opencl.llb.CL
-
-Style InterfaceOnly
-
-ClassJavadoc CLGL /**
-ClassJavadoc CLGL  * Java bindings to OpenCL, the Open Computing Language.
-ClassJavadoc CLGL  * OpenGL - OpenCL interoperability.
-ClassJavadoc CLGL  * @author Michael Bien, GlueGen, et al.
-ClassJavadoc CLGL  */
-JavaClass CLGL
-
-Extends CLGL CL
-
-#only include token starting with CL_GL_ and methods containing GL
-IgnoreNot CL_GL_.*|cl.*GL.*|.*_GL_.*
-
-CustomJavaCode CLGL /** To be used on Mac OSX instead of {@link #CL_CGL_SHAREGROUP_KHR}}. FIXME: For all Mac OSX versions? */
-CustomJavaCode CLGL public static final int CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE = 0x10000000;
-
-#append to generated c files
-#CustomCCode #include <inttypes.h>