From b01a770355a7ad7c67c8f14e5f948f451efac3b2 Mon Sep 17 00:00:00 2001
From: Mark Lobodzinski <mark@lunarg.com>
Date: Mon, 14 Aug 2017 15:26:30 -0600
Subject: header: Update to version 1.0.58 of the vulkan hdr

- updated vulkan.h
- updated vk.xml
- updated cgenerator.py
- updated Win/Lin json files
- updated vulkan.hpp
- updated vk_validation_error_messages.h
- updated vk_validation_error_database.h

Change-Id: I8c525b6a2bd69914440c6d7984a67446b27e6c23
---
 scripts/cgenerator.py |  7 +++++++
 scripts/vk.xml        | 42 +++++++++++++++++++++++++++++++++++++++---
 2 files changed, 46 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/cgenerator.py b/scripts/cgenerator.py
index 836de52d..534e024f 100644
--- a/scripts/cgenerator.py
+++ b/scripts/cgenerator.py
@@ -305,6 +305,13 @@ class COutputGenerator(OutputGenerator):
             (numVal,strVal) = self.enumToValue(elem, True)
             name = elem.get('name')
 
+            # Check for duplicate enum values and raise an error if found.
+            for elem2 in groupElem.findall('enum'):
+                if (elem != elem2):
+                    (numVal2,strVal2) = self.enumToValue(elem2, True)
+                    if (numVal2 == numVal):
+                        raise UserWarning('Duplicate enum ' + name + ' = ' + elem2.get('name') + ' = ' + strVal)
+
             # Extension enumerants are only included if they are required
             if (self.isEnumRequired(elem)):
                 body += "    " + name + " = " + strVal + ",\n"
diff --git a/scripts/vk.xml b/scripts/vk.xml
index 85a49afb..7c5f258a 100644
--- a/scripts/vk.xml
+++ b/scripts/vk.xml
@@ -106,7 +106,7 @@ private version is maintained in the 1.0 branch of the member gitlab server.
         <type category="define">// Vulkan 1.0 version number
 #define <name>VK_API_VERSION_1_0</name> <type>VK_MAKE_VERSION</type>(1, 0, 0)// Patch version should always be set to 0</type>
         <type category="define">// Version of this file
-#define <name>VK_HEADER_VERSION</name> 57</type>
+#define <name>VK_HEADER_VERSION</name> 58</type>
 
         <type category="define">
 #define <name>VK_DEFINE_HANDLE</name>(object) typedef struct object##_T* object;</type>
@@ -6218,7 +6218,7 @@ private version is maintained in the 1.0 branch of the member gitlab server.
         </extension>
         <extension name="VK_NVX_device_generated_commands" number="87" type="device" author="NVX" contact="Christoph Kubisch @pixeljetstream" supported="vulkan">
             <require>
-                <enum value="1"                                         name="VK_NVX_DEVICE_GENERATED_COMMANDS_SPEC_VERSION"/>
+                <enum value="3"                                         name="VK_NVX_DEVICE_GENERATED_COMMANDS_SPEC_VERSION"/>
                 <enum value="&quot;VK_NVX_device_generated_commands&quot;"    name="VK_NVX_DEVICE_GENERATED_COMMANDS_EXTENSION_NAME"/>
                 <enum offset="0" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX"/>
                 <enum offset="1" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX"/>
@@ -6629,7 +6629,7 @@ private version is maintained in the 1.0 branch of the member gitlab server.
         </extension>
         <extension name="VK_KHR_dedicated_allocation" number="128" type="device" author="KHR" contact="James Jones @cubanismo" supported="vulkan">
             <require>
-                <enum value="1"                                         name="VK_KHR_DEDICATED_ALLOCATION_SPEC_VERSION"/>
+                <enum value="3"                                         name="VK_KHR_DEDICATED_ALLOCATION_SPEC_VERSION"/>
                 <enum value="&quot;VK_KHR_dedicated_allocation&quot;"   name="VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME"/>
                 <enum offset="0" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR"/>
                 <enum offset="1" extends="VkStructureType"              name="VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR"/>
@@ -6922,5 +6922,41 @@ private version is maintained in the 1.0 branch of the member gitlab server.
                 <enum value="&quot;VK_EXT_extension_162&quot;"           name="VK_EXT_EXTENSION_162_EXTENSION_NAME"/>
             </require>
         </extension>
+        <extension name="VK_EXT_shader_viewport_index_layer" number="163" type="device" author="NV" contact="Daniel Koch @dgkoch" supported="vulkan">
+            <require>
+                <enum value="1"                                          name="VK_EXT_SHADER_VIEWPORT_INDEX_LAYER_SPEC_VERSION"/>
+                <enum value="&quot;VK_EXT_shader_viewport_index_layer&quot;"  name="VK_EXT_SHADER_VIEWPORT_INDEX_LAYER_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_NV_extension_164" number="164" author="NV" contact="Daniel Koch @dgkoch" supported="disabled">
+            <require>
+                <enum value="0"                                          name="VK_EXT_EXTENSION_164_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_extension_164&quot;"            name="VK_EXT_EXTENSION_164_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_NV_extension_165" number="165" author="NV" contact="Daniel Koch @dgkoch" supported="disabled">
+            <require>
+                <enum value="0"                                          name="VK_EXT_EXTENSION_165_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_extension_165&quot;"            name="VK_EXT_EXTENSION_165_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_NV_extension_166" number="166" author="NV" contact="Daniel Koch @dgkoch" supported="disabled">
+            <require>
+                <enum value="0"                                          name="VK_EXT_EXTENSION_166_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_extension_166&quot;"            name="VK_EXT_EXTENSION_166_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_NV_extension_167" number="167" author="NV" contact="Daniel Koch @dgkoch" supported="disabled">
+            <require>
+                <enum value="0"                                          name="VK_EXT_EXTENSION_167_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_extension_167&quot;"            name="VK_EXT_EXTENSION_167_EXTENSION_NAME"/>
+            </require>
+        </extension>
+        <extension name="VK_NV_extension_168" number="168" author="NV" contact="Daniel Koch @dgkoch" supported="disabled">
+            <require>
+                <enum value="0"                                          name="VK_EXT_EXTENSION_168_SPEC_VERSION"/>
+                <enum value="&quot;VK_NV_extension_168&quot;"            name="VK_EXT_EXTENSION_168_EXTENSION_NAME"/>
+            </require>
+        </extension>
     </extensions>
 </registry>
-- 
cgit v1.2.3