From abd742f3aef2d441c08026d28b363edb9e760acb Mon Sep 17 00:00:00 2001
From: Sun Serega <sunserega2@gmail.com>
Date: Sat, 1 Jul 2023 17:14:50 +0300
Subject: [PATCH 1/7] <type category="function">

---
 xml/cl.xml       | 81 ++++++++++++++++++++++++++++++++++++++++--------
 xml/registry.rnc | 18 +++++++++--
 2 files changed, 84 insertions(+), 15 deletions(-)

diff --git a/xml/cl.xml b/xml/cl.xml
index 219e2c5f1..0d9d5e41f 100644
--- a/xml/cl.xml
+++ b/xml/cl.xml
@@ -372,6 +372,61 @@ server's OpenCL/api-docs repository.
             <member><type>cl_uint</type>                                 <name>num_mutable_dispatch</name></member>
             <member>const <type>cl_mutable_dispatch_config_khr</type>*   <name>mutable_dispatch_list</name></member>
         </type>
+        
+        <type category="function" name="cl_enqueue_svm_free_callback">
+            <proto><type>void</type></proto>
+            <param><type>cl_command_queue</type>            <name>queue</name></param>
+            <param><type>cl_uint</type>                     <name>num_svm_pointers</name></param>
+            <param><type>void</type>*                       <name>svm_pointers</name>[]</param>
+            <param><type>void</type>*                       <name>user_data</name></param>
+        </type>
+        
+        <type category="function" name="cl_create_context_callback">
+            <proto><type>void</type></proto>
+            <param>const <type>char</type>*                 <name>errinfo</name></param>
+            <param>const <type>void</type>*                 <name>private_info</name></param>
+            <param><type>size_t</type>                      <name>cb</name></param>
+            <param><type>void</type>*                       <name>user_data</name></param>
+        </type>
+        
+        <type category="function" name="cl_context_destructor_callback">
+            <proto><type>void</type></proto>
+            <param><type>cl_context</type>                  <name>context</name></param>
+            <param><type>void</type>*                       <name>user_data</name></param>
+        </type>
+        
+        <type category="function" name="cl_mem_object_destructor_callback">
+            <proto><type>void</type></proto>
+            <param><type>cl_mem</type>                      <name>memobj</name></param>
+            <param><type>void</type>*                       <name>user_data</name></param>
+        </type>
+        
+        <type category="function" name="cl_program_callback">
+            <proto><type>void</type></proto>
+            <param><type>cl_program</type>                  <name>program</name></param>
+            <param><type>void</type>*                       <name>user_data</name></param>
+        </type>
+        
+        <type category="function" name="cl_event_callback">
+            <proto><type>void</type></proto>
+            <param><type>cl_event</type>                    <name>event</name></param>
+            <param><type>cl_int</type>                      <name>event_command_status</name></param>
+            <param><type>void</type>*                       <name>user_data</name></param>
+        </type>
+        
+        <type category="function" name="cl_enqueue_native_kernel_callback">
+            <proto><type>void</type></proto>
+            <param><type>void</type>*                       <name>user_data</name></param>
+        </type>
+        
+        <type category="function" name="cl_printf_callback">
+            <proto><type>void</type></proto>
+            <param>const <type>char</type>*                 <name>buffer</name></param>
+            <param><type>size_t</type>                      <name>len</name></param>
+            <param><type>size_t</type>                      <name>complete</name></param>
+            <param><type>void</type>*                       <name>user_data</name></param>
+        </type>
+        
     </types>
 
     <!-- SECTION: OpenCL enumerant (token) definitions. -->
@@ -2720,7 +2775,7 @@ server's OpenCL/api-docs repository.
             <param><type>cl_command_queue</type>           <name>command_queue</name></param>
             <param><type>cl_uint</type>                    <name>num_svm_pointers</name></param>
             <param><type>void</type>*                      <name>svm_pointers</name>[]</param>
-            <param>void (CL_CALLBACK*                      <name>pfn_free_func</name>)(cl_command_queue queue, cl_uint num_svm_pointers, void * svm_pointers[], void *user_data)</param>
+            <param><type>cl_enqueue_svm_free_callback</type> <name>pfn_free_func</name></param>
             <param><type>void</type>*                      <name>user_data</name></param>
             <param><type>cl_uint</type>                    <name>num_events_in_wait_list</name></param>
             <param>const <type>cl_event</type>*            <name>event_wait_list</name></param>
@@ -3297,7 +3352,7 @@ server's OpenCL/api-docs repository.
             <param>const <type>cl_context_properties</type>*            <name>properties</name></param>
             <param><type>cl_uint</type>                                 <name>num_devices</name></param>
             <param>const <type>cl_device_id</type>*                     <name>devices</name></param>
-            <param>void (CL_CALLBACK*                                   <name>pfn_notify</name>)(const char* errinfo, const void* private_info, size_t cb, void* user_data)</param>
+            <param><type>cl_create_context_callback</type>              <name>pfn_notify</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
             <param><type>cl_int</type>*                                 <name>errcode_ret</name></param>
         </command>
@@ -3305,7 +3360,7 @@ server's OpenCL/api-docs repository.
             <proto><type>cl_context</type>                              <name>clCreateContextFromType</name></proto>
             <param>const <type>cl_context_properties</type>*            <name>properties</name></param>
             <param><type>cl_device_type</type>                          <name>device_type</name></param>
-            <param>void (CL_CALLBACK*                                   <name>pfn_notify</name>)(const char* errinfo, const void* private_info, size_t cb, void* user_data)</param>
+            <param><type>cl_create_context_callback</type>              <name>pfn_notify</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
             <param><type>cl_int</type>*                                 <name>errcode_ret</name></param>
         </command>
@@ -3328,7 +3383,7 @@ server's OpenCL/api-docs repository.
         <command suffix="CL_API_SUFFIX__VERSION_3_0">
             <proto><type>cl_int</type>                                  <name>clSetContextDestructorCallback</name></proto>
             <param><type>cl_context</type>                              <name>context</name></param>
-            <param>void (CL_CALLBACK*                                   <name>pfn_notify</name>)(cl_context context, void* user_data)</param>
+            <param><type>cl_context_destructor_callback</type>          <name>pfn_notify</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
         </command>
         <command suffix="CL_API_SUFFIX__VERSION_2_0">
@@ -3451,13 +3506,13 @@ server's OpenCL/api-docs repository.
         <command suffix="CL_API_SUFFIX__VERSION_1_1">
             <proto><type>cl_int</type>                                  <name>clSetMemObjectDestructorCallback</name></proto>
             <param><type>cl_mem</type>                                  <name>memobj</name></param>
-            <param>void (CL_CALLBACK*                                   <name>pfn_notify</name>)(cl_mem memobj, void* user_data)</param>
+            <param><type>cl_mem_object_destructor_callback</type>       <name>pfn_notify</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
         </command>
         <command suffix="CL_API_SUFFIX__VERSION_1_0">
             <proto><type>cl_int</type>                                  <name>clSetMemObjectDestructorAPPLE</name></proto>
             <param><type>cl_mem</type>                                  <name>memobj</name></param>
-            <param>void (CL_CALLBACK*                                   <name>pfn_notify</name>)(cl_mem memobj, void* user_data)</param>
+            <param><type>cl_mem_object_destructor_callback</type>       <name>pfn_notify</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
         </command>
         <command suffix="CL_API_SUFFIX__VERSION_2_0">
@@ -3541,7 +3596,7 @@ server's OpenCL/api-docs repository.
             <param><type>cl_uint</type>                                 <name>num_devices</name></param>
             <param>const <type>cl_device_id</type>*                     <name>device_list</name></param>
             <param>const <type>char</type>*                             <name>options</name></param>
-            <param>void (CL_CALLBACK*                                   <name>pfn_notify</name>)(cl_program program, void* user_data)</param>
+            <param><type>cl_program_callback</type>                     <name>pfn_notify</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
         </command>
         <command suffix="CL_API_SUFFIX__VERSION_1_2">
@@ -3553,7 +3608,7 @@ server's OpenCL/api-docs repository.
             <param><type>cl_uint</type>                                 <name>num_input_headers</name></param>
             <param>const <type>cl_program</type>*                       <name>input_headers</name></param>
             <param>const <type>char</type>**                            <name>header_include_names</name></param>
-            <param>void (CL_CALLBACK*                                   <name>pfn_notify</name>)(cl_program program, void* user_data)</param>
+            <param><type>cl_program_callback</type>                     <name>pfn_notify</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
         </command>
         <command suffix="CL_API_SUFFIX__VERSION_1_2">
@@ -3564,14 +3619,14 @@ server's OpenCL/api-docs repository.
             <param>const <type>char</type>*                             <name>options</name></param>
             <param><type>cl_uint</type>                                 <name>num_input_programs</name></param>
             <param>const <type>cl_program</type>*                       <name>input_programs</name></param>
-            <param>void (CL_CALLBACK*                                   <name>pfn_notify</name>)(cl_program program, void* user_data)</param>
+            <param><type>cl_program_callback</type>                     <name>pfn_notify</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
             <param><type>cl_int</type>*                                 <name>errcode_ret</name></param>
         </command>
         <command prefix="CL_API_PREFIX__VERSION_2_2_DEPRECATED" suffix="CL_API_SUFFIX__VERSION_2_2_DEPRECATED">
             <proto><type>cl_int</type>                                  <name>clSetProgramReleaseCallback</name></proto>
             <param><type>cl_program</type>                              <name>program</name></param>
-            <param>void (CL_CALLBACK*                                   <name>pfn_notify</name>)(cl_program program, void* user_data)</param>
+            <param><type>cl_program_callback</type>                     <name>pfn_notify</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
         </command>
         <command suffix="CL_API_SUFFIX__VERSION_2_2">
@@ -3720,7 +3775,7 @@ server's OpenCL/api-docs repository.
             <proto><type>cl_int</type>                                  <name>clSetEventCallback</name></proto>
             <param><type>cl_event</type>                                <name>event</name></param>
             <param><type>cl_int</type>                                  <name>command_exec_callback_type</name></param>
-            <param>void (CL_CALLBACK*                                   <name>pfn_notify</name>)(cl_event event, cl_int event_command_status, void *user_data)</param>
+            <param><type>cl_event_callback</type>                       <name>pfn_notify</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
         </command>
         <command suffix="CL_API_SUFFIX__VERSION_1_0">
@@ -3974,7 +4029,7 @@ server's OpenCL/api-docs repository.
         <command suffix="CL_API_SUFFIX__VERSION_1_0">
             <proto><type>cl_int</type>                                  <name>clEnqueueNativeKernel</name></proto>
             <param><type>cl_command_queue</type>                        <name>command_queue</name></param>
-            <param>void (CL_CALLBACK*                                   <name>user_func</name>)(void*)</param>
+            <param><type>cl_enqueue_native_kernel_callback</type>       <name>user_func</name></param>
             <param><type>void</type>*                                   <name>args</name></param>
             <param><type>size_t</type>                                  <name>cb_args</name></param>
             <param><type>cl_uint</type>                                 <name>num_mem_objects</name></param>
@@ -4003,7 +4058,7 @@ server's OpenCL/api-docs repository.
             <param><type>cl_command_queue</type>                        <name>command_queue</name></param>
             <param><type>cl_uint</type>                                 <name>num_svm_pointers</name></param>
             <param><type>void</type>*                                   <name>svm_pointers</name>[]</param>
-            <param>void (CL_CALLBACK*                                   <name>pfn_free_func</name>)(cl_command_queue queue, cl_uint num_svm_pointers, void* svm_pointers[], void* user_data)</param>
+            <param><type>cl_enqueue_svm_free_callback</type>            <name>pfn_free_func</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
             <param><type>cl_uint</type>                                 <name>num_events_in_wait_list</name></param>
             <param>const <type>cl_event</type>*                         <name>event_wait_list</name></param>
diff --git a/xml/registry.rnc b/xml/registry.rnc
index d2055e79f..fd79e8dd4 100644
--- a/xml/registry.rnc
+++ b/xml/registry.rnc
@@ -82,7 +82,7 @@ Types = element types {
 #   api - matches a <feature> api attribute, if present
 #   requires - name of another type definition required by this one
 #   category - if present, 'enum' indicates a matching <enums>
-#       block to generate an enumerated type for, and 'struct'
+#       block to generate an enumerated type for, and 'struct'/'function'
 #       causes special interpretation of the contents of the type
 #       tag including ... TBD ...
 #       Other allowed values are 'include', 'define', 'handle' and 'bitmask',
@@ -122,6 +122,9 @@ Types = element types {
 #       noautovalidity - tag stating that no automatic validity language should be generated
 #       values - comma-separated list of legal values, usually used only for sType enums
 #   <comment> - containing arbitrary text (unused)
+# For types with category 'function', contents should be one <proto> and zero or more <param>
+#   <proto> - contains a single <type> tag, indicating return value of function pointer
+#   <param> - like <param> tag in <command>
 #
 # *** There's a problem here: I'm not sure how to represent the <type>
 # syntax where it may contain arbitrarily interleaved text, <type>, and
@@ -169,7 +172,18 @@ Type = element type {
                 }
             } |
             element comment { text }
-        ) *
+        ) * |
+        (
+            element proto {
+                element type { TypeName }
+            } ,
+            element param {
+                mixed {
+                    element type { TypeName } ? ,
+                    element name { text } ?
+                }
+            } *
+        )
     )
 }
 

From 1d4454755699f3adaea7d41976d2d675b712158b Mon Sep 17 00:00:00 2001
From: Sun Serega <sunserega2@gmail.com>
Date: Fri, 5 Sep 2025 17:50:21 +0200
Subject: [PATCH 2/7] add function types to <require>

---
 xml/cl.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/xml/cl.xml b/xml/cl.xml
index 62c19cb92..60b2d3bf4 100644
--- a/xml/cl.xml
+++ b/xml/cl.xml
@@ -4679,6 +4679,9 @@ server's OpenCL/api-docs repository.
             <type name="cl_profiling_info"/>
             <type name="cl_image_format"/>
             <type name="cl_buffer_region"/>
+            <type name="cl_create_context_callback"/>
+            <type name="cl_program_callback"/>
+            <type name="cl_enqueue_native_kernel_callback"/>
         </require>
         <require comment="Constants">
             <enum name="CL_CHAR_BIT"/>
@@ -5185,6 +5188,8 @@ server's OpenCL/api-docs repository.
     <feature api="opencl" name="CL_VERSION_1_1" number="1.1" comment="OpenCL core API interface definitions">
         <require>
             <type name="cl_buffer_create_type"/>
+            <type name="cl_mem_object_destructor_callback"/>
+            <type name="cl_event_callback"/>
         </require>
         <require comment="Constants">
             <enum name="CL_NAN"/>
@@ -5451,6 +5456,7 @@ server's OpenCL/api-docs repository.
             <type name="cl_pipe_info"/>
             <type name="cl_sampler_properties"/>
             <type name="cl_kernel_exec_info"/>
+            <type name="cl_enqueue_svm_free_callback"/>
         </require>
         <require comment="Error codes">
             <enum name="CL_INVALID_PIPE_SIZE"/>
@@ -5636,6 +5642,7 @@ server's OpenCL/api-docs repository.
             <type name="cl_mem_properties"/>
             <type name="cl_version"/>
             <type name="cl_name_version"/>
+            <type name="cl_context_destructor_callback"/>
         </require>
         <require comment="cl_device_atomic_capabilities - bitfield">
             <enum name="CL_DEVICE_ATOMIC_ORDER_RELAXED"/>
@@ -5916,6 +5923,7 @@ server's OpenCL/api-docs repository.
         <extension name="cl_APPLE_SetMemObjectDestructor" revision="0.0.0" comment="not registered" supported="opencl">
             <require>
                 <type name="CL/cl.h"/>
+                <type name="cl_mem_object_destructor_callback"/>
             </require>
             <require>
                 <command name="clSetMemObjectDestructorAPPLE"/>
@@ -6390,6 +6398,7 @@ server's OpenCL/api-docs repository.
                 <type name="cl_svm_mem_flags_arm"/>
                 <type name="cl_kernel_exec_info_arm"/>
                 <type name="cl_device_svm_capabilities_arm"/>
+                <type name="cl_enqueue_svm_free_callback"/>
             </require>
             <require comment="cl_device_info">
                 <enum name="CL_DEVICE_SVM_CAPABILITIES_ARM"/>

From 9f334df03051282343cb4a287f1d7e537c8f28cb Mon Sep 17 00:00:00 2001
From: Sun Serega <sunserega2@gmail.com>
Date: Sat, 18 Oct 2025 02:06:04 +0200
Subject: [PATCH 3/7] rename callbacks

---
 xml/cl.xml | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/xml/cl.xml b/xml/cl.xml
index 2e46a8fa3..17d644c57 100644
--- a/xml/cl.xml
+++ b/xml/cl.xml
@@ -463,7 +463,7 @@ server's OpenCL/api-docs repository.
     CL_SVM_CAPABILITY_CONCURRENT_ATOMIC_ACCESS_KHR | \
     CL_SVM_CAPABILITY_INDIRECT_ACCESS_KHR)</type>
 
-        <type category="function" name="cl_enqueue_svm_free_callback">
+        <type category="function" name="cl_free_svm_callback">
             <proto><type>void</type></proto>
             <param><type>cl_command_queue</type>            <name>queue</name></param>
             <param><type>cl_uint</type>                     <name>num_svm_pointers</name></param>
@@ -471,7 +471,7 @@ server's OpenCL/api-docs repository.
             <param><type>void</type>*                       <name>user_data</name></param>
         </type>
 
-        <type category="function" name="cl_create_context_callback">
+        <type category="function" name="cl_context_error_callback">
             <proto><type>void</type></proto>
             <param>const <type>char</type>*                 <name>errinfo</name></param>
             <param>const <type>void</type>*                 <name>private_info</name></param>
@@ -479,13 +479,13 @@ server's OpenCL/api-docs repository.
             <param><type>void</type>*                       <name>user_data</name></param>
         </type>
 
-        <type category="function" name="cl_context_destructor_callback">
+        <type category="function" name="cl_context_destruction_callback">
             <proto><type>void</type></proto>
             <param><type>cl_context</type>                  <name>context</name></param>
             <param><type>void</type>*                       <name>user_data</name></param>
         </type>
 
-        <type category="function" name="cl_mem_object_destructor_callback">
+        <type category="function" name="cl_mem_object_destruction_callback">
             <proto><type>void</type></proto>
             <param><type>cl_mem</type>                      <name>memobj</name></param>
             <param><type>void</type>*                       <name>user_data</name></param>
@@ -497,14 +497,14 @@ server's OpenCL/api-docs repository.
             <param><type>void</type>*                       <name>user_data</name></param>
         </type>
 
-        <type category="function" name="cl_event_callback">
+        <type category="function" name="cl_event_status_change_callback">
             <proto><type>void</type></proto>
             <param><type>cl_event</type>                    <name>event</name></param>
             <param><type>cl_int</type>                      <name>event_command_status</name></param>
             <param><type>void</type>*                       <name>user_data</name></param>
         </type>
 
-        <type category="function" name="cl_enqueue_native_kernel_callback">
+        <type category="function" name="cl_native_kernel_callback">
             <proto><type>void</type></proto>
             <param><type>void</type>*                       <name>user_data</name></param>
         </type>
@@ -3002,7 +3002,7 @@ server's OpenCL/api-docs repository.
             <param><type>cl_command_queue</type>           <name>command_queue</name></param>
             <param><type>cl_uint</type>                    <name>num_svm_pointers</name></param>
             <param><type>void</type>*                      <name>svm_pointers</name>[]</param>
-            <param><type>cl_enqueue_svm_free_callback</type> <name>pfn_free_func</name></param>
+            <param><type>cl_free_svm_callback</type>       <name>pfn_free_func</name></param>
             <param><type>void</type>*                      <name>user_data</name></param>
             <param><type>cl_uint</type>                    <name>num_events_in_wait_list</name></param>
             <param>const <type>cl_event</type>*            <name>event_wait_list</name></param>
@@ -3650,7 +3650,7 @@ server's OpenCL/api-docs repository.
             <param>const <type>cl_context_properties</type>*            <name>properties</name></param>
             <param><type>cl_uint</type>                                 <name>num_devices</name></param>
             <param>const <type>cl_device_id</type>*                     <name>devices</name></param>
-            <param><type>cl_create_context_callback</type>              <name>pfn_notify</name></param>
+            <param><type>cl_context_error_callback</type>               <name>pfn_notify</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
             <param><type>cl_int</type>*                                 <name>errcode_ret</name></param>
         </command>
@@ -3658,7 +3658,7 @@ server's OpenCL/api-docs repository.
             <proto><type>cl_context</type>                              <name>clCreateContextFromType</name></proto>
             <param>const <type>cl_context_properties</type>*            <name>properties</name></param>
             <param><type>cl_device_type</type>                          <name>device_type</name></param>
-            <param><type>cl_create_context_callback</type>              <name>pfn_notify</name></param>
+            <param><type>cl_context_error_callback</type>               <name>pfn_notify</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
             <param><type>cl_int</type>*                                 <name>errcode_ret</name></param>
         </command>
@@ -3681,7 +3681,7 @@ server's OpenCL/api-docs repository.
         <command suffix="CL_API_SUFFIX__VERSION_3_0">
             <proto><type>cl_int</type>                                  <name>clSetContextDestructorCallback</name></proto>
             <param><type>cl_context</type>                              <name>context</name></param>
-            <param><type>cl_context_destructor_callback</type>          <name>pfn_notify</name></param>
+            <param><type>cl_context_destruction_callback</type>         <name>pfn_notify</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
         </command>
         <command suffix="CL_API_SUFFIX__VERSION_2_0">
@@ -3804,13 +3804,13 @@ server's OpenCL/api-docs repository.
         <command suffix="CL_API_SUFFIX__VERSION_1_1">
             <proto><type>cl_int</type>                                  <name>clSetMemObjectDestructorCallback</name></proto>
             <param><type>cl_mem</type>                                  <name>memobj</name></param>
-            <param><type>cl_mem_object_destructor_callback</type>       <name>pfn_notify</name></param>
+            <param><type>cl_mem_object_destruction_callback</type>      <name>pfn_notify</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
         </command>
         <command suffix="CL_API_SUFFIX__VERSION_1_0">
             <proto><type>cl_int</type>                                  <name>clSetMemObjectDestructorAPPLE</name></proto>
             <param><type>cl_mem</type>                                  <name>memobj</name></param>
-            <param><type>cl_mem_object_destructor_callback</type>       <name>pfn_notify</name></param>
+            <param><type>cl_mem_object_destruction_callback</type>      <name>pfn_notify</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
         </command>
         <command suffix="CL_API_SUFFIX__VERSION_2_0">
@@ -4079,7 +4079,7 @@ server's OpenCL/api-docs repository.
             <proto><type>cl_int</type>                                  <name>clSetEventCallback</name></proto>
             <param><type>cl_event</type>                                <name>event</name></param>
             <param><type>cl_int</type>                                  <name>command_exec_callback_type</name></param>
-            <param><type>cl_event_callback</type>                       <name>pfn_notify</name></param>
+            <param><type>cl_event_status_change_callback</type>         <name>pfn_notify</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
         </command>
         <command suffix="CL_API_SUFFIX__VERSION_1_0">
@@ -4333,7 +4333,7 @@ server's OpenCL/api-docs repository.
         <command suffix="CL_API_SUFFIX__VERSION_1_0">
             <proto><type>cl_int</type>                                  <name>clEnqueueNativeKernel</name></proto>
             <param><type>cl_command_queue</type>                        <name>command_queue</name></param>
-            <param><type>cl_enqueue_native_kernel_callback</type>       <name>user_func</name></param>
+            <param><type>cl_native_kernel_callback</type>               <name>user_func</name></param>
             <param><type>void</type>*                                   <name>args</name></param>
             <param><type>size_t</type>                                  <name>cb_args</name></param>
             <param><type>cl_uint</type>                                 <name>num_mem_objects</name></param>
@@ -4362,7 +4362,7 @@ server's OpenCL/api-docs repository.
             <param><type>cl_command_queue</type>                        <name>command_queue</name></param>
             <param><type>cl_uint</type>                                 <name>num_svm_pointers</name></param>
             <param><type>void</type>*                                   <name>svm_pointers</name>[]</param>
-            <param><type>cl_enqueue_svm_free_callback</type>            <name>pfn_free_func</name></param>
+            <param><type>cl_free_svm_callback</type>                    <name>pfn_free_func</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
             <param><type>cl_uint</type>                                 <name>num_events_in_wait_list</name></param>
             <param>const <type>cl_event</type>*                         <name>event_wait_list</name></param>
@@ -4680,9 +4680,9 @@ server's OpenCL/api-docs repository.
             <type name="cl_profiling_info"/>
             <type name="cl_image_format"/>
             <type name="cl_buffer_region"/>
-            <type name="cl_create_context_callback"/>
+            <type name="cl_context_error_callback"/>
             <type name="cl_program_callback"/>
-            <type name="cl_enqueue_native_kernel_callback"/>
+            <type name="cl_native_kernel_callback"/>
         </require>
         <require comment="Constants">
             <enum name="CL_CHAR_BIT"/>
@@ -5189,8 +5189,8 @@ server's OpenCL/api-docs repository.
     <feature api="opencl" name="CL_VERSION_1_1" number="1.1" comment="OpenCL core API interface definitions">
         <require>
             <type name="cl_buffer_create_type"/>
-            <type name="cl_mem_object_destructor_callback"/>
-            <type name="cl_event_callback"/>
+            <type name="cl_mem_object_destruction_callback"/>
+            <type name="cl_event_status_change_callback"/>
         </require>
         <require comment="Constants">
             <enum name="CL_NAN"/>
@@ -5457,7 +5457,7 @@ server's OpenCL/api-docs repository.
             <type name="cl_pipe_info"/>
             <type name="cl_sampler_properties"/>
             <type name="cl_kernel_exec_info"/>
-            <type name="cl_enqueue_svm_free_callback"/>
+            <type name="cl_free_svm_callback"/>
         </require>
         <require comment="Error codes">
             <enum name="CL_INVALID_PIPE_SIZE"/>
@@ -5643,7 +5643,7 @@ server's OpenCL/api-docs repository.
             <type name="cl_mem_properties"/>
             <type name="cl_version"/>
             <type name="cl_name_version"/>
-            <type name="cl_context_destructor_callback"/>
+            <type name="cl_context_destruction_callback"/>
         </require>
         <require comment="cl_device_atomic_capabilities - bitfield">
             <enum name="CL_DEVICE_ATOMIC_ORDER_RELAXED"/>
@@ -5924,7 +5924,7 @@ server's OpenCL/api-docs repository.
         <extension name="cl_APPLE_SetMemObjectDestructor" revision="0.0.0" comment="not registered" supported="opencl">
             <require>
                 <type name="CL/cl.h"/>
-                <type name="cl_mem_object_destructor_callback"/>
+                <type name="cl_mem_object_destruction_callback"/>
             </require>
             <require>
                 <command name="clSetMemObjectDestructorAPPLE"/>
@@ -6400,7 +6400,7 @@ server's OpenCL/api-docs repository.
                 <type name="cl_svm_mem_flags_arm"/>
                 <type name="cl_kernel_exec_info_arm"/>
                 <type name="cl_device_svm_capabilities_arm"/>
-                <type name="cl_enqueue_svm_free_callback"/>
+                <type name="cl_free_svm_callback"/>
             </require>
             <require comment="cl_device_info">
                 <enum name="CL_DEVICE_SVM_CAPABILITIES_ARM"/>

From 81b0230159072801f791993d10e70103a6d1fd96 Mon Sep 17 00:00:00 2001
From: Sun Serega <sunserega2@gmail.com>
Date: Sun, 19 Oct 2025 15:57:43 +0200
Subject: [PATCH 4/7] fix tests

---
 xml/cl.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/xml/cl.xml b/xml/cl.xml
index 17d644c57..06d03c2ce 100644
--- a/xml/cl.xml
+++ b/xml/cl.xml
@@ -463,7 +463,7 @@ server's OpenCL/api-docs repository.
     CL_SVM_CAPABILITY_CONCURRENT_ATOMIC_ACCESS_KHR | \
     CL_SVM_CAPABILITY_INDIRECT_ACCESS_KHR)</type>
 
-        <type category="function" name="cl_free_svm_callback">
+        <type category="funcpointer" name="cl_free_svm_callback">
             <proto><type>void</type></proto>
             <param><type>cl_command_queue</type>            <name>queue</name></param>
             <param><type>cl_uint</type>                     <name>num_svm_pointers</name></param>
@@ -471,7 +471,7 @@ server's OpenCL/api-docs repository.
             <param><type>void</type>*                       <name>user_data</name></param>
         </type>
 
-        <type category="function" name="cl_context_error_callback">
+        <type category="funcpointer" name="cl_context_error_callback">
             <proto><type>void</type></proto>
             <param>const <type>char</type>*                 <name>errinfo</name></param>
             <param>const <type>void</type>*                 <name>private_info</name></param>
@@ -479,37 +479,37 @@ server's OpenCL/api-docs repository.
             <param><type>void</type>*                       <name>user_data</name></param>
         </type>
 
-        <type category="function" name="cl_context_destruction_callback">
+        <type category="funcpointer" name="cl_context_destruction_callback">
             <proto><type>void</type></proto>
             <param><type>cl_context</type>                  <name>context</name></param>
             <param><type>void</type>*                       <name>user_data</name></param>
         </type>
 
-        <type category="function" name="cl_mem_object_destruction_callback">
+        <type category="funcpointer" name="cl_mem_object_destruction_callback">
             <proto><type>void</type></proto>
             <param><type>cl_mem</type>                      <name>memobj</name></param>
             <param><type>void</type>*                       <name>user_data</name></param>
         </type>
 
-        <type category="function" name="cl_program_callback">
+        <type category="funcpointer" name="cl_program_callback">
             <proto><type>void</type></proto>
             <param><type>cl_program</type>                  <name>program</name></param>
             <param><type>void</type>*                       <name>user_data</name></param>
         </type>
 
-        <type category="function" name="cl_event_status_change_callback">
+        <type category="funcpointer" name="cl_event_status_change_callback">
             <proto><type>void</type></proto>
             <param><type>cl_event</type>                    <name>event</name></param>
             <param><type>cl_int</type>                      <name>event_command_status</name></param>
             <param><type>void</type>*                       <name>user_data</name></param>
         </type>
 
-        <type category="function" name="cl_native_kernel_callback">
+        <type category="funcpointer" name="cl_native_kernel_callback">
             <proto><type>void</type></proto>
             <param><type>void</type>*                       <name>user_data</name></param>
         </type>
 
-        <type category="function" name="cl_printf_callback">
+        <type category="funcpointer" name="cl_printf_callback">
             <proto><type>void</type></proto>
             <param>const <type>char</type>*                 <name>buffer</name></param>
             <param><type>size_t</type>                      <name>len</name></param>

From 296e1d498d542048d90332e10a6e0ceacb738e77 Mon Sep 17 00:00:00 2001
From: Sun Serega <sunserega2@gmail.com>
Date: Tue, 28 Oct 2025 12:38:13 +0100
Subject: [PATCH 5/7] cl_program_destruction_callback

---
 xml/cl.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/xml/cl.xml b/xml/cl.xml
index 06d03c2ce..e740e861f 100644
--- a/xml/cl.xml
+++ b/xml/cl.xml
@@ -497,6 +497,12 @@ server's OpenCL/api-docs repository.
             <param><type>void</type>*                       <name>user_data</name></param>
         </type>
 
+        <type category="funcpointer" name="cl_program_destruction_callback">
+            <proto><type>void</type></proto>
+            <param><type>cl_program</type>                  <name>program</name></param>
+            <param><type>void</type>*                       <name>user_data</name></param>
+        </type>
+
         <type category="funcpointer" name="cl_event_status_change_callback">
             <proto><type>void</type></proto>
             <param><type>cl_event</type>                    <name>event</name></param>
@@ -3924,7 +3930,7 @@ server's OpenCL/api-docs repository.
         <command prefix="CL_API_PREFIX__VERSION_2_2_DEPRECATED" suffix="CL_API_SUFFIX__VERSION_2_2_DEPRECATED">
             <proto><type>cl_int</type>                                  <name>clSetProgramReleaseCallback</name></proto>
             <param><type>cl_program</type>                              <name>program</name></param>
-            <param><type>cl_program_callback</type>                     <name>pfn_notify</name></param>
+            <param><type>cl_program_destruction_callback</type>         <name>pfn_notify</name></param>
             <param><type>void</type>*                                   <name>user_data</name></param>
         </command>
         <command suffix="CL_API_SUFFIX__VERSION_2_2">
@@ -5619,6 +5625,9 @@ server's OpenCL/api-docs repository.
     </feature>
 
     <feature api="opencl" name="CL_VERSION_2_2" number="2.2" comment="OpenCL core API interface definitions">
+        <require>
+            <type name="cl_program_destruction_callback"/>
+        </require>
         <require comment="Error codes">
             <enum name="CL_INVALID_SPEC_ID"/>
             <enum name="CL_MAX_SIZE_RESTRICTION_EXCEEDED"/>

From c28b73ca198abb1369f4f039edff2e61a1cf5456 Mon Sep 17 00:00:00 2001
From: Sun Serega <sunserega2@gmail.com>
Date: Tue, 28 Oct 2025 12:38:59 +0100
Subject: [PATCH 6/7] add guards

---
 xml/cl.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xml/cl.xml b/xml/cl.xml
index e740e861f..65296e6d3 100644
--- a/xml/cl.xml
+++ b/xml/cl.xml
@@ -5933,6 +5933,8 @@ server's OpenCL/api-docs repository.
         <extension name="cl_APPLE_SetMemObjectDestructor" revision="0.0.0" comment="not registered" supported="opencl">
             <require>
                 <type name="CL/cl.h"/>
+            </require>
+            <require condition="!defined(CL_VERSION_1_1)" comment="defined in CL.h for OpenCL 1.1 and newer">
                 <type name="cl_mem_object_destruction_callback"/>
             </require>
             <require>
@@ -6409,6 +6411,8 @@ server's OpenCL/api-docs repository.
                 <type name="cl_svm_mem_flags_arm"/>
                 <type name="cl_kernel_exec_info_arm"/>
                 <type name="cl_device_svm_capabilities_arm"/>
+            </require>
+            <require condition="!defined(CL_VERSION_2_0)" comment="defined in CL.h for OpenCL 2.0 and newer">
                 <type name="cl_free_svm_callback"/>
             </require>
             <require comment="cl_device_info">

From 766cf1254d62e95975c7a3f76c2bdcdf3795bb2c Mon Sep 17 00:00:00 2001
From: Sun Serega <sunserega2@gmail.com>
Date: Tue, 28 Oct 2025 12:42:36 +0100
Subject: [PATCH 7/7] add cl_printf_callback to <require>

---
 xml/cl.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xml/cl.xml b/xml/cl.xml
index 65296e6d3..b0907351f 100644
--- a/xml/cl.xml
+++ b/xml/cl.xml
@@ -6135,6 +6135,9 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
+            <require>
+                <type name="cl_printf_callback"/>
+            </require>
             <require comment="cl_context_properties">
                 <enum name="CL_PRINTF_CALLBACK_ARM"/>
                 <enum name="CL_PRINTF_BUFFERSIZE_ARM"/>