header: Update header files to version 1.0.33

- Updated vulkan.h
- Updated vk.xml
- updated windows/linux *.json files
- updated Linux SOVERSION
- updated vulkan.hpp

Change-Id: I8128a610d1cd24a1ac49712f28d566f712f4cc94

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 694527c..d1e71ac 100644 (file)
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -43,7 +43,7 @@ extern "C" {
 #define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3ff)
 #define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xfff)
 // Version of this file
-#define VK_HEADER_VERSION 32
+#define VK_HEADER_VERSION 33
 
 
 #define VK_NULL_HANDLE 0

diff --git a/include/vulkan/vulkan.hpp b/include/vulkan/vulkan.hpp
index aa48e1c..dd7e4a6 100644 (file)
--- a/include/vulkan/vulkan.hpp
+++ b/include/vulkan/vulkan.hpp
@@ -40,7 +40,7 @@
 # include <vector>
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-static_assert( VK_HEADER_VERSION ==  32 , "Wrong VK_HEADER_VERSION!" );
+static_assert( VK_HEADER_VERSION ==  33 , "Wrong VK_HEADER_VERSION!" );
 
 // 32-bit vulkan is not typesafe for handles, so don't allow copy constructors on this platform by default.
 // To enable this feature on 32-bit platforms please define VULKAN_HPP_TYPESAFE_CONVERSION

diff --git a/layers/linux/VkLayer_core_validation.json b/layers/linux/VkLayer_core_validation.json
index a3ae7cc..84b923d 100644 (file)
--- a/layers/linux/VkLayer_core_validation.json
+++ b/layers/linux/VkLayer_core_validation.json
@@ -4,7 +4,7 @@
         "name": "VK_LAYER_LUNARG_core_validation",
         "type": "GLOBAL",
         "library_path": "./libVkLayer_core_validation.so",
-        "api_version": "1.0.32",
+        "api_version": "1.0.33",
         "implementation_version": "1",
         "description": "LunarG Validation Layer",
         "instance_extensions": [

diff --git a/layers/linux/VkLayer_image.json b/layers/linux/VkLayer_image.json
index 862dd61..c326b83 100644 (file)
--- a/layers/linux/VkLayer_image.json
+++ b/layers/linux/VkLayer_image.json
@@ -4,7 +4,7 @@
         "name": "VK_LAYER_LUNARG_image",
         "type": "GLOBAL",
         "library_path": "./libVkLayer_image.so",
-        "api_version": "1.0.32",
+        "api_version": "1.0.33",
         "implementation_version": "1",
         "description": "LunarG Validation Layer",
         "instance_extensions": [

diff --git a/layers/linux/VkLayer_object_tracker.json b/layers/linux/VkLayer_object_tracker.json
index a367a46..5fb92c2 100644 (file)
--- a/layers/linux/VkLayer_object_tracker.json
+++ b/layers/linux/VkLayer_object_tracker.json
@@ -4,7 +4,7 @@
         "name": "VK_LAYER_LUNARG_object_tracker",
         "type": "GLOBAL",
         "library_path": "./libVkLayer_object_tracker.so",
-        "api_version": "1.0.32",
+        "api_version": "1.0.33",
         "implementation_version": "1",
         "description": "LunarG Validation Layer",
         "instance_extensions": [

diff --git a/layers/linux/VkLayer_parameter_validation.json b/layers/linux/VkLayer_parameter_validation.json
index 09ab6fe..68a829e 100644 (file)
--- a/layers/linux/VkLayer_parameter_validation.json
+++ b/layers/linux/VkLayer_parameter_validation.json
@@ -4,7 +4,7 @@
         "name": "VK_LAYER_LUNARG_parameter_validation",
         "type": "GLOBAL",
         "library_path": "./libVkLayer_parameter_validation.so",
-        "api_version": "1.0.32",
+        "api_version": "1.0.33",
         "implementation_version": "1",
         "description": "LunarG Validation Layer",
         "instance_extensions": [

diff --git a/layers/linux/VkLayer_swapchain.json b/layers/linux/VkLayer_swapchain.json
index eb611d7..af3b6ad 100644 (file)
--- a/layers/linux/VkLayer_swapchain.json
+++ b/layers/linux/VkLayer_swapchain.json
@@ -4,7 +4,7 @@
         "name": "VK_LAYER_LUNARG_swapchain",
         "type": "GLOBAL",
         "library_path": "./libVkLayer_swapchain.so",
-        "api_version": "1.0.32",
+        "api_version": "1.0.33",
         "implementation_version": "1",
         "description": "LunarG Validation Layer",
         "instance_extensions": [

diff --git a/layers/linux/VkLayer_threading.json b/layers/linux/VkLayer_threading.json
index 400c2f9..9a16ce6 100644 (file)
--- a/layers/linux/VkLayer_threading.json
+++ b/layers/linux/VkLayer_threading.json
@@ -4,7 +4,7 @@
         "name": "VK_LAYER_GOOGLE_threading",
         "type": "GLOBAL",
         "library_path": "./libVkLayer_threading.so",
-        "api_version": "1.0.32",
+        "api_version": "1.0.33",
         "implementation_version": "1",
         "description": "Google Validation Layer",
         "instance_extensions": [

diff --git a/layers/linux/VkLayer_unique_objects.json b/layers/linux/VkLayer_unique_objects.json
index b58ebdc..68ec516 100644 (file)
--- a/layers/linux/VkLayer_unique_objects.json
+++ b/layers/linux/VkLayer_unique_objects.json
@@ -4,7 +4,7 @@
         "name": "VK_LAYER_GOOGLE_unique_objects",
         "type": "GLOBAL",
         "library_path": "./libVkLayer_unique_objects.so",
-        "api_version": "1.0.32",
+        "api_version": "1.0.33",
         "implementation_version": "1",
         "description": "Google Validation Layer"
     }

diff --git a/layers/windows/VkLayer_core_validation.json b/layers/windows/VkLayer_core_validation.json
index 8a1d028..0047800 100644 (file)
--- a/layers/windows/VkLayer_core_validation.json
+++ b/layers/windows/VkLayer_core_validation.json
@@ -4,7 +4,7 @@
         "name": "VK_LAYER_LUNARG_core_validation",
         "type": "GLOBAL",
         "library_path": ".\\VkLayer_core_validation.dll",
-        "api_version": "1.0.32",
+        "api_version": "1.0.33",
         "implementation_version": "1",
         "description": "LunarG Validation Layer",
         "instance_extensions": [

diff --git a/layers/windows/VkLayer_image.json b/layers/windows/VkLayer_image.json
index de6b113..571b841 100644 (file)
--- a/layers/windows/VkLayer_image.json
+++ b/layers/windows/VkLayer_image.json
@@ -4,7 +4,7 @@
         "name": "VK_LAYER_LUNARG_image",
         "type": "GLOBAL",
         "library_path": ".\\VkLayer_image.dll",
-        "api_version": "1.0.32",
+        "api_version": "1.0.33",
         "implementation_version": "1",
         "description": "LunarG Validation Layer",
         "instance_extensions": [

diff --git a/layers/windows/VkLayer_object_tracker.json b/layers/windows/VkLayer_object_tracker.json
index 75b2efe..a266f56 100644 (file)
--- a/layers/windows/VkLayer_object_tracker.json
+++ b/layers/windows/VkLayer_object_tracker.json
@@ -4,7 +4,7 @@
         "name": "VK_LAYER_LUNARG_object_tracker",
         "type": "GLOBAL",
         "library_path": ".\\VkLayer_object_tracker.dll",
-        "api_version": "1.0.32",
+        "api_version": "1.0.33",
         "implementation_version": "1",
         "description": "LunarG Validation Layer",
         "instance_extensions": [

diff --git a/layers/windows/VkLayer_parameter_validation.json b/layers/windows/VkLayer_parameter_validation.json
index 2173251..a1fb271 100644 (file)
--- a/layers/windows/VkLayer_parameter_validation.json
+++ b/layers/windows/VkLayer_parameter_validation.json
@@ -4,7 +4,7 @@
         "name": "VK_LAYER_LUNARG_parameter_validation",
         "type": "GLOBAL",
         "library_path": ".\\VkLayer_parameter_validation.dll",
-        "api_version": "1.0.32",
+        "api_version": "1.0.33",
         "implementation_version": "1",
         "description": "LunarG Validation Layer",
         "instance_extensions": [

diff --git a/layers/windows/VkLayer_swapchain.json b/layers/windows/VkLayer_swapchain.json
index cdccd6e..e2963dd 100644 (file)
--- a/layers/windows/VkLayer_swapchain.json
+++ b/layers/windows/VkLayer_swapchain.json
@@ -4,7 +4,7 @@
         "name": "VK_LAYER_LUNARG_swapchain",
         "type": "GLOBAL",
         "library_path": ".\\VkLayer_swapchain.dll",
-        "api_version": "1.0.32",
+        "api_version": "1.0.33",
         "implementation_version": "1",
         "description": "LunarG Validation Layer",
         "instance_extensions": [

diff --git a/layers/windows/VkLayer_threading.json b/layers/windows/VkLayer_threading.json
index 582e4a1..48a0986 100644 (file)
--- a/layers/windows/VkLayer_threading.json
+++ b/layers/windows/VkLayer_threading.json
@@ -4,7 +4,7 @@
         "name": "VK_LAYER_GOOGLE_threading",
         "type": "GLOBAL",
         "library_path": ".\\VkLayer_threading.dll",
-        "api_version": "1.0.32",
+        "api_version": "1.0.33",
         "implementation_version": "1",
         "description": "Google Validation Layer",
         "instance_extensions": [

diff --git a/layers/windows/VkLayer_unique_objects.json b/layers/windows/VkLayer_unique_objects.json
index 8512d10..cf1d6d0 100644 (file)
--- a/layers/windows/VkLayer_unique_objects.json
+++ b/layers/windows/VkLayer_unique_objects.json
@@ -4,7 +4,7 @@
         "name": "VK_LAYER_GOOGLE_unique_objects",
         "type": "GLOBAL",
         "library_path": ".\\VkLayer_unique_objects.dll",
-        "api_version": "1.0.32",
+        "api_version": "1.0.33",
         "implementation_version": "1",
         "description": "Google Validation Layer"
     }

diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index f448e9f..03df97f 100644 (file)
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -84,7 +84,7 @@ else()
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith")
 
     add_library(${API_LOWERCASE} SHARED ${LOADER_SRCS})
-    set_target_properties(${API_LOWERCASE} PROPERTIES SOVERSION "1" VERSION "1.0.32")
+    set_target_properties(${API_LOWERCASE} PROPERTIES SOVERSION "1" VERSION "1.0.33")
     target_link_libraries(${API_LOWERCASE} -ldl -lpthread -lm)
     install(TARGETS ${API_LOWERCASE} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()

diff --git a/vk.xml b/vk.xml
index 8b622b4..b10301e 100644 (file)
--- a/vk.xml
+++ b/vk.xml
@@ -104,7 +104,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project.
         <type category="define">// Vulkan 1.0 version number
 #define <name>VK_API_VERSION_1_0</name> <type>VK_MAKE_VERSION</type>(1, 0, 0)</type>    <!-- The patch version here should never be set to anything other than 0 -->
         <type category="define">// Version of this file
-#define <name>VK_HEADER_VERSION</name> 32</type>
+#define <name>VK_HEADER_VERSION</name> 33</type>
 
         <type category="define">
 #define <name>VK_DEFINE_HANDLE</name>(object) typedef struct object##_T* object;</type>
@@ -1590,7 +1590,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project.
         <type category="struct" name="VkImportMemoryWin32HandleInfoNV">
             <member values="VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member>
             <member>const <type>void</type>*                      <name>pNext</name></member>
-            <member><type>VkExternalMemoryHandleTypeFlagsNV</type> <name>handleType</name></member>
+            <member optional="true"><type>VkExternalMemoryHandleTypeFlagsNV</type> <name>handleType</name></member>
             <member><type>HANDLE</type>                           <name>handle</name></member>
         </type>
         <type category="struct" name="VkExportMemoryWin32HandleInfoNV">
@@ -3028,10 +3028,16 @@ maintained in the master branch of the Khronos Vulkan GitHub project.
             <proto><type>VkResult</type> <name>vkBeginCommandBuffer</name></proto>
             <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
             <param>const <type>VkCommandBufferBeginInfo</type>* <name>pBeginInfo</name></param>
+            <implicitexternsyncparams>
+                <param>the sname:VkCommandPool that pname:commandBuffer was allocated from</param>
+            </implicitexternsyncparams>
         </command>
         <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY">
             <proto><type>VkResult</type> <name>vkEndCommandBuffer</name></proto>
             <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
+            <implicitexternsyncparams>
+                <param>the sname:VkCommandPool that pname:commandBuffer was allocated from</param>
+            </implicitexternsyncparams>
         </command>
         <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY">
             <proto><type>VkResult</type> <name>vkResetCommandBuffer</name></proto>
@@ -4529,5 +4535,29 @@ maintained in the master branch of the Khronos Vulkan GitHub project.
                  <enum value="&quot;VK_KHR_extension_84&quot;"           name="VK_KHR_EXTENSION_84_EXTENSION_NAME"/>
              </require>
          </extension>
+         <extension name="VK_KHR_extension_85" number="85" author="KHR" contact="Ian Elliott @ianelliott" supported="disabled">
+             <require>
+                 <enum value="0"                                         name="VK_KHR_EXTENSION_85_SPEC_VERSION"/>
+                 <enum value="&quot;VK_KHR_extension_85&quot;"           name="VK_KHR_EXTENSION_85_EXTENSION_NAME"/>
+             </require>
+         </extension>
+         <extension name="VK_KHR_extension_86" number="86" author="KHR" contact="Markus Tavenrath @mtavenrath" supported="disabled">
+             <require>
+                 <enum value="0"                                         name="VK_KHR_EXTENSION_86_SPEC_VERSION"/>
+                 <enum value="&quot;VK_KHR_extension_86&quot;"           name="VK_KHR_EXTENSION_86_EXTENSION_NAME"/>
+              </require>
+         </extension>
+         <extension name="VK_NV_extension_87" number="87" author="NVIDIA" contact="Christoph Kubisch @pixeljetstream" supported="disabled">
+             <require>
+                 <enum value="0"                                         name="VK_NV_EXTENSION_87_SPEC_VERSION"/>
+                 <enum value="&quot;VK_NV_extension_87&quot;"            name="VK_NV_EXTENSION_87_EXTENSION_NAME"/>
+              </require>
+         </extension>
+         <extension name="VK_KHR_extension_88" number="88" author="NV" contact="Eric Werness @ewerness" supported="disabled">
+             <require>
+                 <enum value="0"                                         name="VK_KHR_EXTENSION_88_SPEC_VERSION"/>
+                 <enum value="&quot;VK_KHR_extension_88&quot;"           name="VK_KHR_EXTENSION_88_EXTENSION_NAME"/>
+              </require>
+         </extension>
     </extensions>
 </registry>