mirror of
https://gitee.com/openharmony/third_party_vulkan-headers
synced 2024-11-23 16:00:01 +00:00
Update for Vulkan-Docs 1.1.126
This commit is contained in:
Jon Leech
Jon Leech
parent
d287523f48
commit
6be1d00866
@ -56,11 +56,11 @@
|
||||
# define VULKAN_HPP_ASSERT assert
|
||||
#endif
|
||||
|
||||
#if defined(__linux__)
|
||||
#if defined(__linux__) || defined(__APPLE__)
|
||||
# include <dlfcn.h>
|
||||
#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 <typename T>
|
||||
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;
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 <code>pMemoryBarriers</code>, <code>pBufferMemoryBarriers</code> or <code>pImageMemoryBarriers</code> <strong class=\"purple\">must</strong> not have any access flag included in its <code>dstAccessMask</code> member if that bit is not supported by any of the pipeline stages in <code>dstStageMask</code>, as specified in the <a href=\"#synchronization-access-types-supported\">table of supported access types</a>."
|
||||
},
|
||||
{
|
||||
"vuid": "VUID-vkCmdWaitEvents-srcQueueFamilyIndex-02803",
|
||||
"text": " The <code>srcQueueFamilyIndex</code> and <code>dstQueueFamilyIndex</code> members of any element of <code>pBufferMemoryBarriers</code> or <code>pImageMemoryBarriers</code> <strong class=\"purple\">must</strong> be equal."
|
||||
},
|
||||
{
|
||||
"vuid": "VUID-vkCmdWaitEvents-commandBuffer-parameter",
|
||||
"text": " <code>commandBuffer</code> <strong class=\"purple\">must</strong> be a valid <code>VkCommandBuffer</code> handle"
|
||||
@ -7005,6 +7009,18 @@
|
||||
"text": " If the parameters define an import operation and the external handle is a host pointer, <code>allocationSize</code> <strong class=\"purple\">must</strong> be an integer multiple of <code>VkPhysicalDeviceExternalMemoryHostPropertiesEXT</code>::<code>minImportedHostPointerAlignment</code>"
|
||||
}
|
||||
],
|
||||
"(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 <code>pNext</code> chain <strong class=\"purple\">must</strong> not contain an instance of <a href=\"#VkDedicatedAllocationMemoryAllocateInfoNV\">VkDedicatedAllocationMemoryAllocateInfoNV</a> with either its <code>image</code> or <code>buffer</code> field set to a value other than <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>."
|
||||
}
|
||||
],
|
||||
"(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 <code>pNext</code> chain <strong class=\"purple\">must</strong> not contain an instance of <a href=\"#VkMemoryDedicatedAllocateInfo\">VkMemoryDedicatedAllocateInfo</a> with either its <code>image</code> or <code>buffer</code> field set to a value other than <a href=\"#VK_NULL_HANDLE\">VK_NULL_HANDLE</a>."
|
||||
}
|
||||
],
|
||||
"(VK_ANDROID_external_memory_android_hardware_buffer)": [
|
||||
{
|
||||
"vuid": "VUID-VkMemoryAllocateInfo-allocationSize-02383",
|
||||
@ -12893,7 +12909,7 @@
|
||||
"text": " All queries used by the command <strong class=\"purple\">must</strong> be unavailable"
|
||||
},
|
||||
{
|
||||
"vuid": "VUID-vkCmdBeginQuery-queryType-2804",
|
||||
"vuid": "VUID-vkCmdBeginQuery-queryType-02804",
|
||||
"text": " The <code>queryType</code> used to create <code>queryPool</code> <strong class=\"purple\">must</strong> not be <code>VK_QUERY_TYPE_TIMESTAMP</code>"
|
||||
},
|
||||
{
|
||||
@ -12975,7 +12991,7 @@
|
||||
"text": " All queries used by the command <strong class=\"purple\">must</strong> be unavailable"
|
||||
},
|
||||
{
|
||||
"vuid": "VUID-vkCmdBeginQueryIndexedEXT-queryType-2804",
|
||||
"vuid": "VUID-vkCmdBeginQueryIndexedEXT-queryType-02804",
|
||||
"text": " The <code>queryType</code> used to create <code>queryPool</code> <strong class=\"purple\">must</strong> not be <code>VK_QUERY_TYPE_TIMESTAMP</code>"
|
||||
},
|
||||
{
|
||||
|
||||
@ -154,7 +154,7 @@ server.
|
||||
<type category="define">// Vulkan 1.1 version number
|
||||
#define <name>VK_API_VERSION_1_1</name> <type>VK_MAKE_VERSION</type>(1, 1, 0)// Patch version should always be set to 0</type>
|
||||
<type category="define">// Version of this file
|
||||
#define <name>VK_HEADER_VERSION</name> 125</type>
|
||||
#define <name>VK_HEADER_VERSION</name> 126</type>
|
||||
|
||||
<type category="define">
|
||||
#define <name>VK_DEFINE_HANDLE</name>(object) typedef struct object##_T* object;</type>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user