diff --git a/include/vulkan/vulkan.hpp b/include/vulkan/vulkan.hpp index 84783ed..342ab70 100644 --- a/include/vulkan/vulkan.hpp +++ b/include/vulkan/vulkan.hpp @@ -56,7 +56,7 @@ # define VULKAN_HPP_ASSERT assert #endif -static_assert( VK_HEADER_VERSION == 102 , "Wrong VK_HEADER_VERSION!" ); +static_assert( VK_HEADER_VERSION == 103 , "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/include/vulkan/vulkan_core.h b/include/vulkan/vulkan_core.h index 166c9e0..ec2a7b5 100644 --- a/include/vulkan/vulkan_core.h +++ b/include/vulkan/vulkan_core.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 102 +#define VK_HEADER_VERSION 103 #define VK_NULL_HANDLE 0 diff --git a/registry/validusage.json b/registry/validusage.json index 22a8546..e90c0f0 100644 --- a/registry/validusage.json +++ b/registry/validusage.json @@ -1,9 +1,9 @@ { "version info": { "schema version": 2, - "api version": "1.1.102", - "comment": "from git branch: github-master commit: 35e7bee5f0f50b7c1634cd205ded035acea43ad9", - "date": "2019-03-04 05:06:36Z" + "api version": "1.1.103", + "comment": "from git branch: github-master commit: 4ad4fd17161efd9bfd1125c0c9d17db6fb276216", + "date": "2019-03-11 09:10:44Z" }, "validation": { "vkGetInstanceProcAddr": { @@ -8572,14 +8572,30 @@ "vuid": "VUID-VkImageViewCreateInfo-image-02087", "text": " If image was created with usage containing VK_IMAGE_USAGE_SHADING_RATE_IMAGE_BIT_NV, format must be VK_FORMAT_R8_UINT" } + ], + "!(VK_EXT_separate_stencil_usage)": [ + { + "vuid": "VUID-VkImageViewCreateInfo-pNext-02661", + "text": " If the pNext chain includes an instance of VkImageViewUsageCreateInfo, its usage member must not include any bits that were not set in the usage member of the VkImageCreateInfo structure used to create image." + } + ], + "(VK_EXT_separate_stencil_usage)": [ + { + "vuid": "VUID-VkImageViewCreateInfo-pNext-02662", + "text": " If the pNext chain includes an instance of VkImageViewUsageCreateInfo, and image was not created with an instance of VkImageStencilUsageCreateInfoEXT in the pNext chain of VkImageCreateInfo, its usage member must not include any bits that were not set in the usage member of the VkImageCreateInfo structure used to create image" + }, + { + "vuid": "VUID-VkImageViewCreateInfo-pNext-02663", + "text": " If the pNext chain includes an instance of VkImageViewUsageCreateInfo, image was created with an instance of VkImageStencilUsageCreateInfoEXT in the pNext chain of VkImageCreateInfo, and subResourceRange.aspectMask includes VK_IMAGE_ASPECT_STENCIL_BIT, the usage member of the VkImageViewUsageCreateInfo instance must not include any bits that were not set in the usage member of the VkImageStencilUsageCreateInfoEXT structure used to create image" + }, + { + "vuid": "VUID-VkImageViewCreateInfo-pNext-02664", + "text": " If the pNext chain includes an instance of VkImageViewUsageCreateInfo, image was created with an instance of VkImageStencilUsageCreateInfoEXT in the pNext chain of VkImageCreateInfo, and subResourceRange.aspectMask includes bits other than VK_IMAGE_ASPECT_STENCIL_BIT, the usage member of the VkImageViewUsageCreateInfo instance must not include any bits that were not set in the usage member of the VkImageCreateInfo structure used to create image" + } ] }, "VkImageViewUsageCreateInfo": { "(VK_VERSION_1_1,VK_KHR_maintenance2)": [ - { - "vuid": "VUID-VkImageViewUsageCreateInfo-usage-01587", - "text": " usage must not include any set bits that were not set in the usage member of the VkImageCreateInfo structure used to create the image this image view is created from." - }, { "vuid": "VUID-VkImageViewUsageCreateInfo-sType-sType", "text": " sType must be VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO" @@ -12545,11 +12561,27 @@ "text": " The format features of image must contain VK_FORMAT_FEATURE_TRANSFER_DST_BIT." } ], - "core": [ + "!(VK_EXT_separate_stencil_usage)": [ { "vuid": "VUID-vkCmdClearDepthStencilImage-image-00009", "text": " image must have been created with VK_IMAGE_USAGE_TRANSFER_DST_BIT usage flag" + } + ], + "(VK_EXT_separate_stencil_usage)": [ + { + "vuid": "VUID-vkCmdClearDepthStencilImage-pRanges-02658", + "text": " If any element of pRanges.aspect includes VK_IMAGE_ASPECT_STENCIL_BIT, and image was created with separate stencil usage, VK_IMAGE_USAGE_TRANSFER_DST_BIT must have been included in the VkImageStencilUsageCreateInfoEXT::stencilUsage used to create image" }, + { + "vuid": "VUID-vkCmdClearDepthStencilImage-pRanges-02659", + "text": " If any element of pRanges.aspect includes VK_IMAGE_ASPECT_STENCIL_BIT, and image was not created with separate stencil usage, VK_IMAGE_USAGE_TRANSFER_DST_BIT must have been included in the VkImageCreateInfo::usage used to create image" + }, + { + "vuid": "VUID-vkCmdClearDepthStencilImage-pRanges-02660", + "text": " If any element of pRanges.aspect includes VK_IMAGE_ASPECT_DEPTH_BIT, VK_IMAGE_USAGE_TRANSFER_DST_BIT must have been included in the VkImageCreateInfo::usage used to create image" + } + ], + "core": [ { "vuid": "VUID-vkCmdClearDepthStencilImage-image-00010", "text": " If image is non-sparse then it must be bound completely and contiguously to a single VkDeviceMemory object" @@ -21470,10 +21502,6 @@ "vuid": "VUID-VkAcquireNextImageInfoKHR-deviceMask-01291", "text": " deviceMask must not be zero" }, - { - "vuid": "VUID-VkAcquireNextImageInfoKHR-semaphore-01804", - "text": " semaphore and fence must not both be equal to VK_NULL_HANDLE." - }, { "vuid": "VUID-VkAcquireNextImageInfoKHR-sType-sType", "text": " sType must be VK_STRUCTURE_TYPE_ACQUIRE_NEXT_IMAGE_INFO_KHR" diff --git a/registry/vk.xml b/registry/vk.xml index fbe08e4..ef45ce5 100644 --- a/registry/vk.xml +++ b/registry/vk.xml @@ -147,7 +147,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 102 +#define VK_HEADER_VERSION 103 #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; @@ -10568,5 +10568,17 @@ typedef void CAMetalLayer; + + + + + + + + + + + +