From 6be1d00866a6d3bf8a1839b902d1de9e7065a4b8 Mon Sep 17 00:00:00 2001 From: Jon Leech Date: Mon, 21 Oct 2019 02:37:33 -0700 Subject: [PATCH] Update for Vulkan-Docs 1.1.126 --- include/vulkan/vulkan.hpp | 12 +++++++----- include/vulkan/vulkan_core.h | 2 +- registry/validusage.json | 26 +++++++++++++++++++++----- registry/vk.xml | 2 +- 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/include/vulkan/vulkan.hpp b/include/vulkan/vulkan.hpp index 6623538..8ee12a2 100644 --- a/include/vulkan/vulkan.hpp +++ b/include/vulkan/vulkan.hpp @@ -56,11 +56,11 @@ # define VULKAN_HPP_ASSERT assert #endif -#if defined(__linux__) +#if defined(__linux__) || defined(__APPLE__) # include #endif -static_assert( VK_HEADER_VERSION == 125 , "Wrong VK_HEADER_VERSION!" ); +static_assert( VK_HEADER_VERSION == 126 , "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 @@ -73795,6 +73795,8 @@ namespace VULKAN_HPP_NAMESPACE { #if defined(__linux__) m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL ); +#elif defined(__APPLE__) + m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL ); #elif defined(_WIN32) m_library = LoadLibrary( "vulkan-1.dll" ); #else @@ -73815,7 +73817,7 @@ namespace VULKAN_HPP_NAMESPACE { if ( m_library ) { -#if defined(__linux__) +#if defined(__linux__) || defined(__APPLE__) dlclose( m_library ); #elif defined(_WIN32) FreeLibrary( m_library ); @@ -73826,7 +73828,7 @@ namespace VULKAN_HPP_NAMESPACE template T getProcAddress( const char* function ) const { -#if defined(__linux__) +#if defined(__linux__) || defined(__APPLE__) return (T)dlsym( m_library, function ); #elif defined(_WIN32) return (T)GetProcAddress( m_library, function ); @@ -73837,7 +73839,7 @@ namespace VULKAN_HPP_NAMESPACE private: bool m_success; -#if defined(__linux__) +#if defined(__linux__) || defined(__APPLE__) void *m_library; #elif defined(_WIN32) HMODULE m_library; diff --git a/include/vulkan/vulkan_core.h b/include/vulkan/vulkan_core.h index 9770c3b..ea929a9 100644 --- a/include/vulkan/vulkan_core.h +++ b/include/vulkan/vulkan_core.h @@ -44,7 +44,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 125 +#define VK_HEADER_VERSION 126 #define VK_NULL_HANDLE 0 diff --git a/registry/validusage.json b/registry/validusage.json index 31ad744..1052654 100644 --- a/registry/validusage.json +++ b/registry/validusage.json @@ -1,9 +1,9 @@ { "version info": { "schema version": 2, - "api version": "1.1.125", - "comment": "from git branch: github-master commit: a5b10770a313a4b1fcf74645c6041c6090630085", - "date": "2019-10-14 03:06:14Z" + "api version": "1.1.126", + "comment": "from git branch: github-master commit: 90add81fa4bf15fceee9a4e015cc07c13f7b00a9", + "date": "2019-10-21 08:53:05Z" }, "validation": { "vkGetInstanceProcAddr": { @@ -2716,6 +2716,10 @@ "vuid": "VUID-vkCmdWaitEvents-pMemoryBarriers-01166", "text": " Each element of pMemoryBarriers, pBufferMemoryBarriers or pImageMemoryBarriers must not have any access flag included in its dstAccessMask member if that bit is not supported by any of the pipeline stages in dstStageMask, as specified in the table of supported access types." }, + { + "vuid": "VUID-vkCmdWaitEvents-srcQueueFamilyIndex-02803", + "text": " The srcQueueFamilyIndex and dstQueueFamilyIndex members of any element of pBufferMemoryBarriers or pImageMemoryBarriers must be equal." + }, { "vuid": "VUID-vkCmdWaitEvents-commandBuffer-parameter", "text": " commandBuffer must be a valid VkCommandBuffer handle" @@ -7005,6 +7009,18 @@ "text": " If the parameters define an import operation and the external handle is a host pointer, allocationSize must be an integer multiple of VkPhysicalDeviceExternalMemoryHostPropertiesEXT::minImportedHostPointerAlignment" } ], + "(VK_EXT_external_memory_host)+(VK_NV_dedicated_allocation)": [ + { + "vuid": "VUID-VkMemoryAllocateInfo-pNext-02805", + "text": " If the parameters define an import operation and the external handle is a host pointer, the pNext chain must not contain an instance of VkDedicatedAllocationMemoryAllocateInfoNV with either its image or buffer field set to a value other than VK_NULL_HANDLE." + } + ], + "(VK_EXT_external_memory_host)+(VK_KHR_dedicated_allocation)": [ + { + "vuid": "VUID-VkMemoryAllocateInfo-pNext-02806", + "text": " If the parameters define an import operation and the external handle is a host pointer, the pNext chain must not contain an instance of VkMemoryDedicatedAllocateInfo with either its image or buffer field set to a value other than VK_NULL_HANDLE." + } + ], "(VK_ANDROID_external_memory_android_hardware_buffer)": [ { "vuid": "VUID-VkMemoryAllocateInfo-allocationSize-02383", @@ -12893,7 +12909,7 @@ "text": " All queries used by the command must be unavailable" }, { - "vuid": "VUID-vkCmdBeginQuery-queryType-2804", + "vuid": "VUID-vkCmdBeginQuery-queryType-02804", "text": " The queryType used to create queryPool must not be VK_QUERY_TYPE_TIMESTAMP" }, { @@ -12975,7 +12991,7 @@ "text": " All queries used by the command must be unavailable" }, { - "vuid": "VUID-vkCmdBeginQueryIndexedEXT-queryType-2804", + "vuid": "VUID-vkCmdBeginQueryIndexedEXT-queryType-02804", "text": " The queryType used to create queryPool must not be VK_QUERY_TYPE_TIMESTAMP" }, { diff --git a/registry/vk.xml b/registry/vk.xml index 3f5ca9c..7efb102 100644 --- a/registry/vk.xml +++ b/registry/vk.xml @@ -154,7 +154,7 @@ server. // Vulkan 1.1 version number #define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0)// Patch version should always be set to 0 // Version of this file -#define VK_HEADER_VERSION 125 +#define VK_HEADER_VERSION 126 #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object;