From 92cb7d8602c5073d423f0974aa231f6ab57e07ad Mon Sep 17 00:00:00 2001
From: Ewan Crawford <ewan@codeplay.com>
Date: Mon, 25 Mar 2024 11:57:24 +0000
Subject: [PATCH] Fixup cl_khr_command_buffer after spec unification

After PR #950 merged the cl_khr_command_buffer spec needs
updated in a couple of places:

* Error around _num_queues_ to `clCreateCommandBufferKHR` should
  be in terms of `cl_khr_command_buffer_multi_device`.
* "New Structure" heading can be deleted as these are listed under
  "New Types"
* Typos in rendering of some types
---
 api/cl_khr_command_buffer.asciidoc | 11 +++--------
 api/opencl_runtime_layer.asciidoc  |  5 ++++-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/api/cl_khr_command_buffer.asciidoc b/api/cl_khr_command_buffer.asciidoc
index 6099d7729..216d84a83 100644
--- a/api/cl_khr_command_buffer.asciidoc
+++ b/api/cl_khr_command_buffer.asciidoc
@@ -198,11 +198,6 @@ extensions to relax usage of the following API features:
   ** {clCommandSVMMemcpyKHR}
   ** {clCommandSVMMemFillKHR}
 
-=== New Structures
-
-  * {cl_command_buffer_khr}
-  * {cl_mutable_command_khr}
-
 === New Types
 
   * {cl_device_command_buffer_capabilities_khr_TYPE}
@@ -220,16 +215,16 @@ extensions to relax usage of the following API features:
   * {cl_device_info_TYPE}
   ** {CL_DEVICE_COMMAND_BUFFER_CAPABILITIES_KHR}
   ** {CL_DEVICE_COMMAND_BUFFER_REQUIRED_QUEUE_PROPERTIES_KHR}
-  * {cl_device_command_buffer_capabilities_khr - bitfield_TYPE}
+  * {cl_device_command_buffer_capabilities_khr_TYPE}
   ** {CL_COMMAND_BUFFER_CAPABILITY_KERNEL_PRINTF_KHR}
   ** {CL_COMMAND_BUFFER_CAPABILITY_DEVICE_SIDE_ENQUEUE_KHR}
   ** {CL_COMMAND_BUFFER_CAPABILITY_SIMULTANEOUS_USE_KHR}
   ** {CL_COMMAND_BUFFER_CAPABILITY_OUT_OF_ORDER_KHR}
   * {cl_command_buffer_properties_khr_TYPE}
   ** {CL_COMMAND_BUFFER_FLAGS_KHR}
-  * {cl_command_buffer_flags_khr - bitfield_TYPE}
+  * {cl_command_buffer_flags_khr_TYPE}
   ** {CL_COMMAND_BUFFER_SIMULTANEOUS_USE_KHR}
-  * {Error codes_TYPE}
+  * New <<error_codes, Error Codes>>
   ** {CL_INVALID_COMMAND_BUFFER_KHR}
   ** {CL_INVALID_SYNC_POINT_WAIT_LIST_KHR}
   ** {CL_INCOMPATIBLE_COMMAND_QUEUE_KHR}
diff --git a/api/opencl_runtime_layer.asciidoc b/api/opencl_runtime_layer.asciidoc
index 298620641..bdac8a7d0 100644
--- a/api/opencl_runtime_layer.asciidoc
+++ b/api/opencl_runtime_layer.asciidoc
@@ -14129,7 +14129,10 @@ returned in _errcode_ret_:
     specified by {CL_DEVICE_COMMAND_BUFFER_REQUIRED_QUEUE_PROPERTIES_KHR}.
   * {CL_INVALID_CONTEXT} if all the command-queues in _queues_ do not have
     the same OpenCL context.
-  * {CL_INVALID_VALUE} if _num_queues_ is zero.
+  * {CL_INVALID_VALUE} if the `<<cl_khr_command_buffer_multi_device>>`
+    extension is supported and _num_queues_ is zero, or if the
+    `<<cl_khr_command_buffer_multi_device>>` extension is not supported
+    and _num_queues_ is not one.
   * {CL_INVALID_VALUE} if _queues_ is `NULL`.
   * {CL_INVALID_VALUE} if values specified in _properties_ are not valid, or
     if the same property name is specified more than once.