From 9ad7f8dcc23b4fcd7719219351961ea1a209858e Mon Sep 17 00:00:00 2001
From: Mark Lobodzinski <mark@lunarg.com>
Date: Tue, 20 Feb 2018 09:37:55 -0700
Subject: header: Update to version 1.0.69 of the Vulkan hdr

- updated vulkan.h
- updated vk.xml
- updated layer json files
- updated vulkan.hpp
- updated validation_error_database.txt
- updated vk_validation_error_messages.h
- updated vuid_mapping.py

Note that the VU text in the database file contains artifacts from
the registry/VUID toolchain. These will be addressed in a follow-on
patch set.

Change-Id: I6994ec17a6edcb6c9028c792c68863cd39f1fc56
---
 scripts/vk.xml          | 17 +++++++++++++----
 scripts/vuid_mapping.py |  1 +
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/vk.xml b/scripts/vk.xml
index 13fc2628..7a6f3aea 100644
--- a/scripts/vk.xml
+++ b/scripts/vk.xml
@@ -107,7 +107,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> 68</type>
+#define <name>VK_HEADER_VERSION</name> 69</type>
 
         <type category="define">
 #define <name>VK_DEFINE_HANDLE</name>(object) typedef struct object##_T* object;</type>
@@ -5486,6 +5486,14 @@ private version is maintained in the 1.0 branch of the member gitlab server.
             <param optional="false">const <type>void</type>* <name>pHostPointer</name></param>
             <param><type>VkMemoryHostPointerPropertiesEXT</type>* <name>pMemoryHostPointerProperties</name></param>
         </command>
+        <command queues="transfer,graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary" pipeline="transfer">
+            <proto><type>void</type> <name>vkCmdWriteBufferMarkerAMD</name></proto>
+            <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
+            <param><type>VkPipelineStageFlagBits</type> <name>pipelineStage</name></param>
+            <param><type>VkBuffer</type> <name>dstBuffer</name></param>
+            <param><type>VkDeviceSize</type> <name>dstOffset</name></param>
+            <param><type>uint32_t</type> <name>marker</name></param>
+        </command>
     </commands>
 
     <feature api="vulkan" name="VK_VERSION_1_0" number="1.0" comment="Vulkan core API interface definitions">
@@ -7522,10 +7530,11 @@ private version is maintained in the 1.0 branch of the member gitlab server.
                 <command name="vkGetMemoryHostPointerPropertiesEXT"/>
             </require>
         </extension>
-        <extension name="VK_AMD_extension_180" number="180" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled">
+        <extension name="VK_AMD_buffer_marker" number="180" type="device" author="AMD" contact="Daniel Rakos @aqnuep" supported="vulkan">
             <require>
-                <enum value="0"                                          name="VK_KHR_EXTENSION_180_SPEC_VERSION"/>
-                <enum value="&quot;VK_AMD_extension_180&quot;"           name="VK_KHR_EXTENSION_180_EXTENSION_NAME"/>
+                <enum value="1"                                          name="VK_AMD_BUFFER_MARKER_SPEC_VERSION"/>
+                <enum value="&quot;VK_AMD_buffer_marker&quot;"           name="VK_AMD_BUFFER_MARKER_EXTENSION_NAME"/>
+                <command name="vkCmdWriteBufferMarkerAMD"/>
             </require>
         </extension>
         <extension name="VK_AMD_extension_181" number="181" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled">
diff --git a/scripts/vuid_mapping.py b/scripts/vuid_mapping.py
index 06d15cd0..031cbe23 100644
--- a/scripts/vuid_mapping.py
+++ b/scripts/vuid_mapping.py
@@ -580,6 +580,7 @@ func_struct_id_map = {
 'vkGetMemoryHostPointerPropertiesEXT' : 524,
 'VkPhysicalDeviceConservativeRasterizationPropertiesEXT' : 525,
 'VkPipelineRasterizationConservativeStateCreateInfoEXT' : 526,
+'vkCmdWriteBufferMarkerAMD' : 527,
 ### ADD New func/struct mappings above this line
 }
 # Mapping of params to unique IDs
-- 
cgit v1.2.3