From 11c6670b4a4f766ed4f1e777d1b3c3dc082dfa5f Mon Sep 17 00:00:00 2001 From: Jon Leech Date: Sun, 15 Nov 2020 23:15:15 -0800 Subject: Update for Vulkan-Docs 1.2.161 --- include/vulkan/vulkan.hpp | 19 +++++++++--------- include/vulkan/vulkan_core.h | 2 +- registry/validusage.json | 46 +++++++++++++++----------------------------- registry/vk.xml | 15 +++++++++++---- 4 files changed, 37 insertions(+), 45 deletions(-) diff --git a/include/vulkan/vulkan.hpp b/include/vulkan/vulkan.hpp index 9ca2fd6..30d830e 100644 --- a/include/vulkan/vulkan.hpp +++ b/include/vulkan/vulkan.hpp @@ -94,7 +94,7 @@ extern "C" __declspec( dllimport ) FARPROC __stdcall GetProcAddress( HINSTANCE h #endif -static_assert( VK_HEADER_VERSION == 160 , "Wrong VK_HEADER_VERSION!" ); +static_assert( VK_HEADER_VERSION == 161 , "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 @@ -955,7 +955,7 @@ namespace VULKAN_HPP_NAMESPACE template >::type, size_t Which = 0> T const & get() const VULKAN_HPP_NOEXCEPT { - return std::get::value>( static_cast&>( *this ) ); + return std::get::value>( static_cast const &>( *this ) ); } template @@ -7850,14 +7850,6 @@ namespace VULKAN_HPP_NAMESPACE } } - enum class SemaphoreCreateFlagBits : VkSemaphoreCreateFlags - {}; - - VULKAN_HPP_INLINE std::string to_string( SemaphoreCreateFlagBits ) - { - return "(void)"; - } - enum class SemaphoreImportFlagBits : VkSemaphoreImportFlags { eTemporary = VK_SEMAPHORE_IMPORT_TEMPORARY_BIT @@ -13078,6 +13070,13 @@ namespace VULKAN_HPP_NAMESPACE return "{ " + result.substr(0, result.size() - 3) + " }"; } + enum class SemaphoreCreateFlagBits : VkFlags + {}; + + VULKAN_HPP_INLINE std::string to_string( SemaphoreCreateFlagBits ) + { + return "(void)"; + } using SemaphoreCreateFlags = Flags; diff --git a/include/vulkan/vulkan_core.h b/include/vulkan/vulkan_core.h index 13d562f..4dc340d 100644 --- a/include/vulkan/vulkan_core.h +++ b/include/vulkan/vulkan_core.h @@ -43,7 +43,7 @@ extern "C" { #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0)// Patch version should always be set to 0 // Version of this file -#define VK_HEADER_VERSION 160 +#define VK_HEADER_VERSION 161 // Complete version of this file #define VK_HEADER_VERSION_COMPLETE VK_MAKE_VERSION(1, 2, VK_HEADER_VERSION) diff --git a/registry/validusage.json b/registry/validusage.json index 04afcfa..773c528 100644 --- a/registry/validusage.json +++ b/registry/validusage.json @@ -1,9 +1,9 @@ { "version info": { "schema version": 2, - "api version": "1.2.160", - "comment": "from git branch: github-main commit: f90136facacd25f016e523064f03713bdfe1b22d", - "date": "2020-11-09 03:02:15Z" + "api version": "1.2.161", + "comment": "from git branch: github-main commit: 9f9fd160c8dbd8752447a4a8a2e32fbb92b9722d", + "date": "2020-11-16 06:16:55Z" }, "validation": { "vkGetInstanceProcAddr": { @@ -3841,10 +3841,6 @@ { "vuid": "VUID-VkRenderPassCreateInfo-pNext-02515", "text": " If the pNext chain includes a VkRenderPassMultiviewCreateInfo structure, and each element of its pViewMasks member is 0, correlatedViewMaskCount must be 0" - }, - { - "vuid": "VUID-VkRenderPassCreateInfo-pNext-02516", - "text": " If the pNext chain includes a VkRenderPassMultiviewCreateInfo structure, each element of its pViewMask member must not have a bit set at an index greater than or equal to VkPhysicalDeviceLimits::maxFramebufferLayers" } ] }, @@ -4374,10 +4370,6 @@ "vuid": "VUID-VkRenderPassCreateInfo2-pDependencies-03060", "text": " For any element of pDependencies where its srcSubpass member equals its dstSubpass member, if the viewMask member of the corresponding element of pSubpasses includes more than one bit, its dependencyFlags member must include VK_DEPENDENCY_VIEW_LOCAL_BIT" }, - { - "vuid": "VUID-VkRenderPassCreateInfo2-viewMask-02524", - "text": " The viewMask member must not have a bit set at an index greater than or equal to VkPhysicalDeviceLimits::maxFramebufferLayers" - }, { "vuid": "VUID-VkRenderPassCreateInfo2-attachment-02525", "text": " If the attachment member of any element of the pInputAttachments member of any element of pSubpasses is not VK_ATTACHMENT_UNUSED, the aspectMask member of that element of pInputAttachments must only include aspects that are present in images of the format specified by the element of pAttachments specified by attachment" @@ -4429,8 +4421,12 @@ ], "(VK_VERSION_1_2,VK_KHR_create_renderpass2)+(VK_KHR_fragment_shading_rate)": [ { - "vuid": "VUID-VkRenderPassCreateInfo2-pAttachmentImageInfos-04520", - "text": " If any element of pAttachmentImageInfos is used as a fragment shading rate attachment in any subpass, it must not be used as any other attachment in the render pass" + "vuid": "VUID-VkRenderPassCreateInfo2-pAttachments-04585", + "text": " If any element of pAttachments is used as a fragment shading rate attachment in any subpass, it must not be used as any other attachment in the render pass" + }, + { + "vuid": "VUID-VkRenderPassCreateInfo2-pAttachments-04586", + "text": " If any element of pAttachments is used as a fragment shading rate attachment in any subpass, it must have an image format whose potential format features contain VK_FORMAT_FEATURE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR" } ], "(VK_VERSION_1_2,VK_KHR_create_renderpass2)+(VK_KHR_fragment_shading_rate)+(VK_QCOM_render_pass_transform)": [ @@ -4726,12 +4722,6 @@ "vuid": "VUID-VkSubpassDescription2-attachment-04563", "text": " If the attachment member of any element of pInputAttachments is not VK_ATTACHMENT_UNUSED, then the aspectMask member must not include VK_IMAGE_ASPECT_MEMORY_PLANE_i_BIT_EXT for any index i" } - ], - "(VK_VERSION_1_2,VK_KHR_create_renderpass2)+(VK_KHR_fragment_shading_rate)": [ - { - "vuid": "VUID-VkSubpassDescription2-pFragmentShadingRateAttachment-04522", - "text": " If the pFragmentShadingRateAttachment member of a VkFragmentShadingRateAttachmentInfoKHR structure included in the pNext chain is not NULL, and its attachment member is not VK_ATTACHMENT_UNUSED, that attachment must not be used as any other attachment in this subpass" - } ] }, "VkSubpassDescriptionDepthStencilResolve": { @@ -4800,10 +4790,6 @@ }, "VkFragmentShadingRateAttachmentInfoKHR": { "(VK_VERSION_1_2,VK_KHR_create_renderpass2)+(VK_KHR_fragment_shading_rate)": [ - { - "vuid": "VUID-VkFragmentShadingRateAttachmentInfoKHR-pFragmentShadingRateAttachment-04523", - "text": " If pFragmentShadingRateAttachment is not NULL and its attachment member is not VK_ATTACHMENT_UNUSED then it must have a format whose features contain VK_FORMAT_FEATURE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR" - }, { "vuid": "VUID-VkFragmentShadingRateAttachmentInfoKHR-pFragmentShadingRateAttachment-04524", "text": " If pFragmentShadingRateAttachment is not NULL and its attachment member is not VK_ATTACHMENT_UNUSED, its layout member must be equal to VK_IMAGE_LAYOUT_GENERAL or VK_IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR" @@ -5309,6 +5295,10 @@ { "vuid": "VUID-VkFramebufferCreateInfo-flags-04545", "text": " If flags includes VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT, the layerCount member of any element of the pAttachmentImageInfos member of an instance of VkFramebufferAttachmentsCreateInfo in the pNext chain that is used as a fragment shading rate attachment must be either 1, or greater than or equal to layers" + }, + { + "vuid": "VUID-VkFramebufferCreateInfo-flags-04587", + "text": " If flags includes VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT, and renderPass was specified with non-zero view masks, each element of pAttachments that is used as a fragment shading rate attachment by renderPass must have a layerCount that is either 1, or greater than the index of the most significant bit set in any of those view masks" } ], "(VK_VERSION_1_2,VK_KHR_imageless_framebuffer)+(VK_VERSION_1_1,VK_KHR_multiview)": [ @@ -10715,10 +10705,6 @@ { "vuid": "VUID-VkExternalMemoryImageCreateInfo-handleTypes-parameter", "text": " handleTypes must be a valid combination of VkExternalMemoryHandleTypeFlagBits values" - }, - { - "vuid": "VUID-VkExternalMemoryImageCreateInfo-handleTypes-requiredbitmask", - "text": " handleTypes must not be 0" } ] }, @@ -11254,17 +11240,17 @@ "(VK_NV_shading_rate_image)": [ { "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" + "text": " If the shadingRateImage feature is enabled, and If image was created with usage containing VK_IMAGE_USAGE_SHADING_RATE_IMAGE_BIT_NV, format must be VK_FORMAT_R8_UINT" } ], "(VK_KHR_fragment_shading_rate)": [ { "vuid": "VUID-VkImageViewCreateInfo-usage-04550", - "text": " If the usage for the image view includes VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR, then the image view’s format features must contain VK_FORMAT_FEATURE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR" + "text": " If the attachmentFragmentShadingRate feature is enabled, and the usage for the image view includes VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR, then the image view’s format features must contain VK_FORMAT_FEATURE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR" }, { "vuid": "VUID-VkImageViewCreateInfo-usage-04551", - "text": " If the usage for the image view includes VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR and layeredShadingRateAttachments is VK_FALSE, subresourceRange.layerCount must be 1" + "text": " If the attachmentFragmentShadingRate feature is enabled, the usage for the image view includes VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR, and layeredShadingRateAttachments is VK_FALSE, subresourceRange.layerCount must be 1" } ], "(VK_EXT_fragment_density_map)+(VK_EXT_fragment_density_map2)": [ diff --git a/registry/vk.xml b/registry/vk.xml index 331360b..28801ae 100644 --- a/registry/vk.xml +++ b/registry/vk.xml @@ -135,7 +135,7 @@ branch of the member gitlab server. // Vulkan 1.2 version number #define VK_API_VERSION_1_2 VK_MAKE_VERSION(1, 2, 0)// Patch version should always be set to 0 // Version of this file -#define VK_HEADER_VERSION 160 +#define VK_HEADER_VERSION 161 // Complete version of this file #define VK_HEADER_VERSION_COMPLETE VK_MAKE_VERSION(1, 2, VK_HEADER_VERSION) @@ -218,6 +218,7 @@ typedef void CAMetalLayer; typedef VkFlags VkPipelineCreateFlags; typedef VkFlags VkColorComponentFlags; typedef VkFlags VkFenceCreateFlags; + When VkSemaphoreCreateFlagBits is first extended, need to add a requires= attribute for it to VkSemaphoreCreateFlags typedef VkFlags VkSemaphoreCreateFlags; typedef VkFlags VkFormatFeatureFlags; typedef VkFlags VkQueryControlFlags; @@ -457,6 +458,7 @@ typedef void CAMetalLayer; + When VkSemaphoreCreateFlagBits is first extended, need to add a type enum tag for it here Extensions @@ -2172,7 +2174,7 @@ typedef void CAMetalLayer; VkStructureType sType const void* pNext - VkExternalMemoryHandleTypeFlags handleTypes + VkExternalMemoryHandleTypeFlags handleTypes @@ -5780,8 +5782,7 @@ typedef void CAMetalLayer; - - + When VkSemaphoreCreateFlagBits is first extended, need to add a bitmask enums tag for it here @@ -14384,6 +14385,12 @@ typedef void CAMetalLayer; + + + + + + -- cgit v1.2.3