Incorporate OpenCL-Headers issue: KhronosGroup/OpenCL-Headers#249

Author: kenba

.github/workflows/rust.yml

@@ -1,4 +1,4 @@
-name: Rust
+name: Rust CI
 
 on:
   push:
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install Rust
         run: rustup update stable
-      - name: Unit test
+      - name: check
         run: cargo check
 
   test:

Cargo.toml

@@ -66,6 +66,7 @@ cl_khr_d3d11_sharing = []
 cl_loader_info = []
 cl_pocl_content_size = []
 cl_loader_layers = []
+cl_img_cancel_command = []
 
 [dependencies]
 libc = "0.2"

src/cl_ext.rs

@@ -271,6 +271,17 @@ pub type clCommandNDRangeKernelKHR_t = Option<
 >;
 pub type clCommandNDRangeKernelKHR_fn = clCommandNDRangeKernelKHR_t;
 
+pub type clGetCommandBufferInfoKHR_t = Option<
+    unsafe extern "C" fn(
+        command_buffer: cl_command_buffer_khr,
+        param_name: cl_command_buffer_info_khr,
+        param_value_size: size_t,
+        param_value: *mut c_void,
+        param_value_size_ret: *mut size_t,
+    ) -> cl_int,
+>;
+pub type clGetCommandBufferInfoKHR_fn = clGetCommandBufferInfoKHR_t;
+
 pub type clCommandSVMMemcpyKHR_t = Option<
     unsafe extern "C" fn(
         command_buffer: cl_command_buffer_khr,
@@ -302,17 +313,6 @@ pub type clCommandSVMMemFillKHR_t = Option<
 >;
 pub type clCommandSVMMemFillKHR_fn = clCommandSVMMemFillKHR_t;
 
-pub type clGetCommandBufferInfoKHR_t = Option<
-    unsafe extern "C" fn(
-        command_buffer: cl_command_buffer_khr,
-        param_name: cl_command_buffer_info_khr,
-        param_value_size: size_t,
-        param_value: *mut c_void,
-        param_value_size_ret: *mut size_t,
-    ) -> cl_int,
->;
-pub type clGetCommandBufferInfoKHR_fn = clGetCommandBufferInfoKHR_t;
-
 #[cfg_attr(not(target_os = "macos"), link(name = "OpenCL"))]
 #[cfg_attr(target_os = "macos", link(name = "OpenCL", kind = "framework"))]
 #[cfg(feature = "cl_khr_command_buffer")]
@@ -466,6 +466,14 @@ extern "system" {
         mutable_handle: *mut cl_mutable_command_khr,
     ) -> cl_int;
 
+    pub fn clGetCommandBufferInfoKHR(
+        command_buffer: cl_command_buffer_khr,
+        param_name: cl_command_buffer_info_khr,
+        param_value_size: size_t,
+        param_value: *mut c_void,
+        param_value_size_ret: *mut size_t,
+    ) -> cl_int;
+
     pub fn clCommandSVMMemcpyKHR(
         command_buffer: cl_command_buffer_khr,
         command_queue: cl_command_queue,
@@ -491,14 +499,6 @@ extern "system" {
         mutable_handle: *mut cl_mutable_command_khr,
     ) -> cl_int;
 
-    pub fn clGetCommandBufferInfoKHR(
-        command_buffer: cl_command_buffer_khr,
-        param_name: cl_command_buffer_info_khr,
-        param_value_size: size_t,
-        param_value: *mut c_void,
-        param_value_size_ret: *mut size_t,
-    ) -> cl_int;
-
 }
 
 // cl_khr_command_buffer_multi_device
@@ -1297,6 +1297,13 @@ pub type cl_mem_alloc_flags_img = cl_bitfield;
 
 // To be used with cl_mem_alloc_flags_img
 pub const CL_MEM_ALLOC_RELAX_REQUIREMENTS_IMG: cl_mem_alloc_flags_img = 1 << 0;
+pub const CL_MEM_ALLOC_GPU_WRITE_COMBINE_IMG: cl_mem_alloc_flags_img = 1 << 1;
+pub const CL_MEM_ALLOC_GPU_CACHED_IMG: cl_mem_alloc_flags_img = 1 << 2;
+pub const CL_MEM_ALLOC_CPU_LOCAL_IMG: cl_mem_alloc_flags_img = 1 << 3;
+pub const CL_MEM_ALLOC_GPU_LOCAL_IMG: cl_mem_alloc_flags_img = 1 << 4;
+pub const CL_MEM_ALLOC_GPU_PRIVATE_IMG: cl_mem_alloc_flags_img = 1 << 5;
+
+pub const CL_DEVICE_MEMORY_CAPABILITIES_IMG: cl_device_info = 0x40D8;
 
 // cl_khr_subgroups extension
 pub const CL_KERNEL_MAX_SUB_GROUP_SIZE_FOR_NDRANGE_KHR: cl_kernel_sub_group_info = 0x2033;
@@ -3102,6 +3109,33 @@ extern "system" {
 pub const CL_UNSIGNED_INT_RAW10_EXT: cl_uint = 0x10E3;
 pub const CL_UNSIGNED_INT_RAW12_EXT: cl_uint = 0x10E4;
 
+// cl_khr_kernel_clock
+
+pub const CL_DEVICE_KERNEL_CLOCK_CAPABILITIES_KHR: cl_device_info = 0x1076;
+
+pub type cl_device_kernel_clock_capabilities_khr = cl_bitfield;
+
+pub const CL_DEVICE_KERNEL_CLOCK_SCOPE_DEVICE_KHR: cl_device_kernel_clock_capabilities_khr = 1 << 0;
+pub const CL_DEVICE_KERNEL_CLOCK_SCOPE_WORK_GROUP_KHR: cl_device_kernel_clock_capabilities_khr = 1 << 1;
+pub const CL_DEVICE_KERNEL_CLOCK_SCOPE_SUB_GROUP_KHR: cl_device_kernel_clock_capabilities_khr = 1 << 2;
+
+// cl_img_cancel_command
+
+pub const CL_CANCELLED_IMG: cl_int = -1126;
+
+pub type clCancelCommandsIMG_t = Option<
+    unsafe extern "C" fn(event_list: *const cl_event, num_events_in_list: usize) -> cl_int,
+>;
+pub type clCancelCommandsIMG_fn = clCancelCommandsIMG_t;
+
+#[cfg_attr(not(target_os = "macos"), link(name = "OpenCL"))]
+#[cfg_attr(target_os = "macos", link(name = "OpenCL", kind = "framework"))]
+#[cfg(feature = "cl_img_cancel_command")]
+#[cfg(feature = "static")]
+unsafe extern "C" {
+    pub fn clCancelCommandsIMG(event_list: *const cl_event, num_events_in_list: usize) -> cl_int;
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;