From fc2f65e8e53b6605556419e950fa98dd6c39840f Mon Sep 17 00:00:00 2001
From: Alastair Murray <alastair.murray@codeplay.com>
Date: Wed, 7 Sep 2022 18:22:37 +0100
Subject: [PATCH 1/2] Ensure cl.xml passes validation

Fixes #830
---
 xml/cl.xml       | 7 ++-----
 xml/registry.rnc | 3 +++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xml/cl.xml b/xml/cl.xml
index 751f445e4..494175338 100644
--- a/xml/cl.xml
+++ b/xml/cl.xml
@@ -494,7 +494,7 @@ server's OpenCL/api-docs repository.
         <enum value="SIZE_MAX"      name="CL_IMPORT_MEMORY_WHOLE_ALLOCATION_ARM"/>
     </enums>
 
-    <enums name="Constants.cl_intel_command_queue_families" vendor="Intel" commant="cl_intel_command_queue_families constants, in cl_ext.h">
+    <enums name="Constants.cl_intel_command_queue_families" vendor="Intel" comment="cl_intel_command_queue_families constants, in cl_ext.h">
         <enum value="64"            name="CL_QUEUE_FAMILY_MAX_NAME_SIZE_INTEL"/>
         <enum value="0"             name="CL_QUEUE_DEFAULT_CAPABILITIES_INTEL"/>
     </enums>
@@ -7144,13 +7144,10 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_QUEUE_JOB_SLOT_ARM"/>
             </require>
         </extension>
-        <extension name="cl_khr_command_buffer_mutable_dispatch" comment="version 0.9.0" supported="opencl">
+        <extension name="cl_khr_command_buffer_mutable_dispatch" requires="cl_khr_command_buffer" comment="version 0.9.0" supported="opencl">
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require>
-                <extension name="cl_khr_command_buffer"/>
-            </require>
             <require>
                 <type name="cl_command_buffer_structure_type_khr"/>
                 <type name="cl_mutable_dispatch_fields_khr"/>
diff --git a/xml/registry.rnc b/xml/registry.rnc
index 998524f26..16e9ee498 100644
--- a/xml/registry.rnc
+++ b/xml/registry.rnc
@@ -436,6 +436,7 @@ Extension = element extension {
     attribute type { text } ? ,
     attribute requires { text } ? ,
     attribute requiresCore { text } ? ,
+    attribute condition { text } ? ,
     attribute supported { StringGroup } ? ,
     attribute promotedto { text } ? ,
     attribute deprecatedby { text } ? ,
@@ -445,6 +446,7 @@ Extension = element extension {
     (
         element require {
             attribute api { text } ? ,
+            attribute condition { text } ? ,
             ProfileName ? ,
             ExtensionName ? ,
             FeatureName ? ,
@@ -478,6 +480,7 @@ InterfaceElement =
     Enum |
     element command {
         Name ,
+        attribute requires { text } ? ,
         Comment ?
     }
 

From 6c9c4c626895a84fe9d873b701e645d75ac0aa27 Mon Sep 17 00:00:00 2001
From: Alastair Murray <alastair.murray@codeplay.com>
Date: Wed, 7 Sep 2022 23:23:44 +0100
Subject: [PATCH 2/2] Add XML validation to CI

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 59dd34fcf..8139d739f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ rvm:
   - 2.3.3
 
 before_install:
-  - sudo apt-get install -y libpango1.0-dev ghostscript fonts-lyx
+  - sudo apt-get install -y libpango1.0-dev ghostscript fonts-lyx jing
   - gem install asciidoctor -v 2.0.16
   - gem install coderay -v 1.1.1
   - gem install rouge -v 3.19.0
@@ -20,6 +20,7 @@ before_install:
 script:
   - git describe --tags --dirty
   - make -O -j 5 api c env ext cxx4opencl manhtmlpages
+  - make -C xml validate
 
 deploy:
   provider: releases