From 260bbf08c506c1b2e6a2541448633d871e061d16 Mon Sep 17 00:00:00 2001
From: Alastair Murray <alastair.murray@codeplay.com>
Date: Wed, 8 Dec 2021 19:34:19 +0000
Subject: [PATCH 1/3] Link `cl_khronos_vendor_id` to OpenCL 3.0 in cl.xml

See script to check for orphans in https://github.com/KhronosGroup/OpenCL-Docs/pull/730
---
 xml/cl.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xml/cl.xml b/xml/cl.xml
index 9f947989b..af049e21e 100644
--- a/xml/cl.xml
+++ b/xml/cl.xml
@@ -5031,6 +5031,10 @@ server's OpenCL/api-docs repository.
             <enum name="CL_DEVICE_QUEUE_SUPPORTED"/>
             <enum name="CL_DEVICE_QUEUE_REPLACEABLE_DEFAULT"/>
         </require>
+        <require comment="cl_khronos_vendor_id">
+            <enum name="CL_KHRONOS_VENDOR_ID_CODEPLAY"/>
+            <enum name="CL_KHRONOS_VENDOR_ID_POCL"/>
+        </require>
         <require comment="cl_platform_info">
             <enum name="CL_PLATFORM_NUMERIC_VERSION"/>
             <enum name="CL_PLATFORM_EXTENSIONS_WITH_VERSION"/>

From 6be4e6bcc266ad53d912bdc23fe5689557b3bf80 Mon Sep 17 00:00:00 2001
From: Alastair Murray <alastair.murray@codeplay.com>
Date: Wed, 15 Dec 2021 00:27:51 +0000
Subject: [PATCH 2/3] Attach assigned vendor IDs to OpenCL 1.0

This is so that they can clearly be used for any OpenCL version.
---
 xml/cl.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/xml/cl.xml b/xml/cl.xml
index af049e21e..4a8b6c129 100644
--- a/xml/cl.xml
+++ b/xml/cl.xml
@@ -4094,6 +4094,9 @@ server's OpenCL/api-docs repository.
             <type name="cl_profiling_info"/>
             <type name="cl_image_format"/>
             <type name="cl_buffer_region"/>
+            <!-- cl_khronos_vendor_id was actually added in OpenCL 3.0, but the
+                 assigned IDs can be used in any OpenCL version. -->
+            <type name="cl_khronos_vendor_id"/>
         </require>
         <require comment="Constants">
             <enum name="CL_CHAR_BIT"/>
@@ -4445,6 +4448,10 @@ server's OpenCL/api-docs repository.
             <enum name="CL_SUBMITTED"/>
             <enum name="CL_QUEUED"/>
         </require>
+        <require comment="cl_khronos_vendor_id">
+            <enum name="CL_KHRONOS_VENDOR_ID_CODEPLAY"/>
+            <enum name="CL_KHRONOS_VENDOR_ID_POCL"/>
+        </require>
         <require comment="Platform APIs">
             <command name="clGetPlatformIDs"/>
             <command name="clGetPlatformInfo"/>
@@ -5013,7 +5020,6 @@ server's OpenCL/api-docs repository.
         <require>
             <type name="cl_device_atomic_capabilities"/>
             <type name="cl_device_device_enqueue_capabilities"/>
-            <type name="cl_khronos_vendor_id"/>
             <type name="cl_mem_properties"/>
             <type name="cl_version"/>
             <type name="cl_name_version"/>
@@ -5031,10 +5037,6 @@ server's OpenCL/api-docs repository.
             <enum name="CL_DEVICE_QUEUE_SUPPORTED"/>
             <enum name="CL_DEVICE_QUEUE_REPLACEABLE_DEFAULT"/>
         </require>
-        <require comment="cl_khronos_vendor_id">
-            <enum name="CL_KHRONOS_VENDOR_ID_CODEPLAY"/>
-            <enum name="CL_KHRONOS_VENDOR_ID_POCL"/>
-        </require>
         <require comment="cl_platform_info">
             <enum name="CL_PLATFORM_NUMERIC_VERSION"/>
             <enum name="CL_PLATFORM_EXTENSIONS_WITH_VERSION"/>

From 913b3df1d7fb728c930dcaac70748a70531aec08 Mon Sep 17 00:00:00 2001
From: Alastair Murray <alastair.murray@codeplay.com>
Date: Mon, 31 Jan 2022 23:52:03 +0000
Subject: [PATCH 3/3] Move the cl_khronos_vendor_id type back to OpenCL 3.0

This was the version that introduced the type.
---
 xml/cl.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/xml/cl.xml b/xml/cl.xml
index 4a8b6c129..e27963850 100644
--- a/xml/cl.xml
+++ b/xml/cl.xml
@@ -4094,9 +4094,6 @@ server's OpenCL/api-docs repository.
             <type name="cl_profiling_info"/>
             <type name="cl_image_format"/>
             <type name="cl_buffer_region"/>
-            <!-- cl_khronos_vendor_id was actually added in OpenCL 3.0, but the
-                 assigned IDs can be used in any OpenCL version. -->
-            <type name="cl_khronos_vendor_id"/>
         </require>
         <require comment="Constants">
             <enum name="CL_CHAR_BIT"/>
@@ -4449,6 +4446,10 @@ server's OpenCL/api-docs repository.
             <enum name="CL_QUEUED"/>
         </require>
         <require comment="cl_khronos_vendor_id">
+            <!-- The cl_khronos_vendor_id type was added in OpenCL 3.0, but the
+                 concept of assigned vendor IDs has existed since OpenCL 1.0.
+                 These enums can be used in any OpenCL version because the type
+                 used in the API is cl_uint. -->
             <enum name="CL_KHRONOS_VENDOR_ID_CODEPLAY"/>
             <enum name="CL_KHRONOS_VENDOR_ID_POCL"/>
         </require>
@@ -5020,6 +5021,7 @@ server's OpenCL/api-docs repository.
         <require>
             <type name="cl_device_atomic_capabilities"/>
             <type name="cl_device_device_enqueue_capabilities"/>
+            <type name="cl_khronos_vendor_id"/>
             <type name="cl_mem_properties"/>
             <type name="cl_version"/>
             <type name="cl_name_version"/>