From 7c92c7d15162111d2e2deab672a5428db1a2dce3 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 24 Apr 2018 08:30:24 -0700 Subject: vulkan: Update the XML and headers to 1.1.80 Acked-by: Lionel Landwerlin --- src/vulkan/registry/vk.xml | 280 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 231 insertions(+), 49 deletions(-) (limited to 'src') diff --git a/src/vulkan/registry/vk.xml b/src/vulkan/registry/vk.xml index 7018bbe8421..4419c6fbf96 100644 --- a/src/vulkan/registry/vk.xml +++ b/src/vulkan/registry/vk.xml @@ -44,13 +44,6 @@ private version is maintained in the master branch of the member gitlab server. - - - - - - - @@ -153,7 +146,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 76 +#define VK_HEADER_VERSION 80 #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; @@ -312,6 +305,7 @@ server. typedef VkFlags VkDebugUtilsMessengerCallbackDataFlagsEXT; typedef VkFlags VkPipelineRasterizationConservativeStateCreateFlagsEXT; typedef VkFlags VkDescriptorBindingFlagsEXT; + typedef VkFlags VkConditionalRenderingFlagsEXT; Types which can be void pointers or class pointers, selected at compile time VK_DEFINE_HANDLE(VkInstance) @@ -444,6 +438,7 @@ server. + Extensions @@ -515,6 +510,9 @@ server. + Enumerated types in the header, but not used by the API + + The PFN_vk*Function types are used by VkAllocationCallbacks below typedef void (VKAPI_PTR *PFN_vkInternalAllocationNotification)( void* pUserData, @@ -2702,6 +2700,13 @@ server. void* pNext VkBool32 supportsTextureGatherLODBiasAMD + + VkStructureType sType + const void* pNext + VkBuffer buffer + VkDeviceSize offset + VkConditionalRenderingFlagsEXT flags + VkStructureType sType const void* pNext @@ -3053,6 +3058,75 @@ server. void* pNext uint32_t maxVariableDescriptorCount + + VkStructureType sType + const void* pNext + VkAttachmentDescriptionFlags flags + VkFormat format + VkSampleCountFlagBits samples + VkAttachmentLoadOp loadOpLoad operation for color or depth data + VkAttachmentStoreOp storeOpStore operation for color or depth data + VkAttachmentLoadOp stencilLoadOpLoad operation for stencil data + VkAttachmentStoreOp stencilStoreOpStore operation for stencil data + VkImageLayout initialLayout + VkImageLayout finalLayout + + + VkStructureType sType + const void* pNext + uint32_t attachment + VkImageLayout layout + VkImageAspectFlags aspectMask + + + VkStructureType sType + const void* pNext + VkSubpassDescriptionFlags flags + VkPipelineBindPoint pipelineBindPoint + uint32_t viewMask + uint32_t inputAttachmentCount + const VkAttachmentReference2KHR* pInputAttachments + uint32_t colorAttachmentCount + const VkAttachmentReference2KHR* pColorAttachments + const VkAttachmentReference2KHR* pResolveAttachments + const VkAttachmentReference2KHR* pDepthStencilAttachment + uint32_t preserveAttachmentCount + const uint32_t* pPreserveAttachments + + + VkStructureType sType + const void* pNext + uint32_t srcSubpass + uint32_t dstSubpass + VkPipelineStageFlags srcStageMask + VkPipelineStageFlags dstStageMask + VkAccessFlags srcAccessMask + VkAccessFlags dstAccessMask + VkDependencyFlags dependencyFlags + int32_t viewOffset + + + VkStructureType sType + const void* pNext + VkRenderPassCreateFlags flags + uint32_t attachmentCount + const VkAttachmentDescription2KHR* pAttachments + uint32_t subpassCount + const VkSubpassDescription2KHR* pSubpasses + uint32_t dependencyCount + const VkSubpassDependency2KHR* pDependencies + uint32_t correlatedViewMaskCount + const uint32_t* pCorrelatedViewMasks + + + VkStructureType sType + const void* pNext + VkSubpassContents contents + + + VkStructureType sType + const void* pNext + uint32_t binding uint32_t divisor @@ -3101,11 +3175,29 @@ server. VkChromaLocation suggestedXChromaOffset VkChromaLocation suggestedYChromaOffset + + VkStructureType sType + const void* pNext + VkBool32 conditionalRenderingEnableWhether this secondary command buffer may be executed during an active conditional rendering + VkStructureType sType void* pNext uint64_t externalFormat + + VkStructureType sType + void* pNext + VkBool32 storageBuffer8BitAccess8-bit integer variables supported in StorageBuffer + VkBool32 uniformAndStorageBuffer8BitAccess8-bit integer variables supported in StorageBuffer and Uniform + VkBool32 storagePushConstant88-bit integer variables supported in PushConstant + + + VkStructureType sType + void* pNext + VkBool32 conditionalRendering + VkBool32 inheritedConditionalRendering + Vulkan enumerant (token) definitions @@ -4179,6 +4271,18 @@ server. + + Vendor IDs are now represented as enums instead of the old + <vendorids> tag, allowing them to be included in the + API headers. + + + + + + + + @@ -5076,6 +5180,15 @@ server. VkQueryPool queryPool uint32_t query + + void vkCmdBeginConditionalRenderingEXT + VkCommandBuffer commandBuffer + const VkConditionalRenderingBeginInfoEXT* pConditionalRenderingBegin + + + void vkCmdEndConditionalRenderingEXT + VkCommandBuffer commandBuffer + void vkCmdResetQueryPool VkCommandBuffer commandBuffer @@ -6070,6 +6183,30 @@ server. VkDeviceSize dstOffset uint32_t marker + + VkResult vkCreateRenderPass2KHR + VkDevice device + const VkRenderPassCreateInfo2KHR* pCreateInfo + const VkAllocationCallbacks* pAllocator + VkRenderPass* pRenderPass + + + void vkCmdBeginRenderPass2KHR + VkCommandBuffer commandBuffer + const VkRenderPassBeginInfo* pRenderPassBegin + const VkSubpassBeginInfoKHR* pSubpassBeginInfo + + + void vkCmdNextSubpass2KHR + VkCommandBuffer commandBuffer + const VkSubpassBeginInfoKHR* pSubpassBeginInfo + const VkSubpassEndInfoKHR* pSubpassEndInfo + + + void vkCmdEndRenderPass2KHR + VkCommandBuffer commandBuffer + const VkSubpassEndInfoKHR* pSubpassEndInfo + VkResult vkGetAndroidHardwareBufferPropertiesANDROID VkDevice device @@ -6328,6 +6465,7 @@ server. + @@ -6828,7 +6966,7 @@ server. - + @@ -6916,7 +7054,7 @@ server. - + @@ -6952,7 +7090,7 @@ server. - + @@ -7000,7 +7138,7 @@ server. - + @@ -7014,7 +7152,7 @@ server. - + @@ -7128,7 +7266,7 @@ server. - + @@ -7155,7 +7293,7 @@ server. - + @@ -7167,7 +7305,7 @@ server. - + @@ -7177,7 +7315,7 @@ server. - + @@ -7188,7 +7326,7 @@ server. - + @@ -7196,7 +7334,7 @@ server. - + @@ -7227,7 +7365,7 @@ server. - + @@ -7306,7 +7444,7 @@ server. - + @@ -7342,7 +7480,7 @@ server. - + @@ -7354,7 +7492,7 @@ server. - + @@ -7367,7 +7505,7 @@ server. - + @@ -7400,7 +7538,7 @@ server. - + @@ -7452,7 +7590,7 @@ server. - + @@ -7476,7 +7614,7 @@ server. - + @@ -7529,10 +7667,23 @@ server. - + - - + + + + + + + + + + + + + + + @@ -7541,7 +7692,7 @@ server. - + @@ -7559,7 +7710,7 @@ server. - + @@ -7841,10 +7992,21 @@ server. - + - - + + + + + + + + + + + + + @@ -7865,7 +8027,7 @@ server. - + @@ -7888,7 +8050,7 @@ server. - + @@ -7931,7 +8093,7 @@ server. - + @@ -7976,7 +8138,7 @@ server. - + @@ -8044,7 +8206,7 @@ server. - + @@ -8115,7 +8277,7 @@ server. - + @@ -8210,7 +8372,7 @@ server. - + @@ -8218,7 +8380,7 @@ server. - + @@ -8355,7 +8517,7 @@ server. - + @@ -8438,7 +8600,7 @@ server. - + @@ -8537,7 +8699,7 @@ server. - + @@ -8602,10 +8764,12 @@ server. - + - - + + + + @@ -8826,5 +8990,23 @@ server. + + + + + + + + + + + + + + + + + + -- cgit v1.2.3