opencl-headers: backport patch from trunk

Latest OpenCL CTS is released after the latest OpenCL Headers and uses a
symbol which is not defined in the release. Backport a patch to make
OpenCL CTS compile.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 45 insertions, 1 deletions

diff --git a/meta-oe/recipes-core/opencl/files/0001-Command-buffer-supported-queue-properties-265.patch b/meta-oe/recipes-core/opencl/files/0001-Command-buffer-supported-queue-properties-265.patch
new file mode 100644
index 0000000000..1654bf48c6
--- /dev/null
+++ b/meta-oe/recipes-core/opencl/files/0001-Command-buffer-supported-queue-properties-265.patch
@@ -0,0 +1,42 @@
+From 85888592e178c7923cd1bc1d69cee530906c80a4 Mon Sep 17 00:00:00 2001
+From: Ewan Crawford <ewan@codeplay.com>
+Date: Tue, 14 Jan 2025 17:14:29 +0000
+Subject: [PATCH] Command-buffer supported queue properties (#265)
+
+Header update generated from OpenCL-Docs PR XML change
+https://github.com/KhronosGroup/OpenCL-Docs/pull/850
+
+Upstream-Status: Backport [https://github.com/KhronosGroup/OpenCL-Headers/commit/d32c5bb219d7ba90ad4f251cf0bb903c08f8e5db]
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
+---
+ CL/cl_ext.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CL/cl_ext.h b/CL/cl_ext.h
+index 1a48985e167b..be5b473ff150 100644
+--- a/CL/cl_ext.h
++++ b/CL/cl_ext.h
+@@ -52,7 +52,7 @@ extern "C" {
+     "cl_khr_command_buffer"
+ 
+ 
+-#define CL_KHR_COMMAND_BUFFER_EXTENSION_VERSION CL_MAKE_VERSION(0, 9, 5)
++#define CL_KHR_COMMAND_BUFFER_EXTENSION_VERSION CL_MAKE_VERSION(0, 9, 6)
+ 
+ typedef cl_bitfield         cl_device_command_buffer_capabilities_khr;
+ typedef struct _cl_command_buffer_khr* cl_command_buffer_khr;
+@@ -66,13 +66,13 @@ typedef struct _cl_mutable_command_khr* cl_mutable_command_khr;
+ 
+ /* cl_device_info */
+ #define CL_DEVICE_COMMAND_BUFFER_CAPABILITIES_KHR           0x12A9
++#define CL_DEVICE_COMMAND_BUFFER_SUPPORTED_QUEUE_PROPERTIES_KHR 0x129A
+ #define CL_DEVICE_COMMAND_BUFFER_REQUIRED_QUEUE_PROPERTIES_KHR 0x12AA
+ 
+ /* cl_device_command_buffer_capabilities_khr - bitfield */
+ #define CL_COMMAND_BUFFER_CAPABILITY_KERNEL_PRINTF_KHR      (1 << 0)
+ #define CL_COMMAND_BUFFER_CAPABILITY_DEVICE_SIDE_ENQUEUE_KHR (1 << 1)
+ #define CL_COMMAND_BUFFER_CAPABILITY_SIMULTANEOUS_USE_KHR   (1 << 2)
+-#define CL_COMMAND_BUFFER_CAPABILITY_OUT_OF_ORDER_KHR       (1 << 3)
+ 
+ /* cl_command_buffer_properties_khr */
+ #define CL_COMMAND_BUFFER_FLAGS_KHR                         0x1293
diff --git a/meta-oe/recipes-core/opencl/opencl-headers_2024.10.24.bb b/meta-oe/recipes-core/opencl/opencl-headers_2024.10.24.bb
index b47d3f9711..412b573cb4 100644
--- a/meta-oe/recipes-core/opencl/opencl-headers_2024.10.24.bb
+++ b/meta-oe/recipes-core/opencl/opencl-headers_2024.10.24.bb
@@ -6,7 +6,9 @@ SECTION = "base"
 
 S = "${WORKDIR}/git"
 SRCREV = "4ea6df132107e3b4b9407f903204b5522fdffcd6"
-SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=main;protocol=https"
+SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=main;protocol=https \
+           file://0001-Command-buffer-supported-queue-properties-265.patch \
+           "
 
 inherit cmake