From cb7b123f2ddc04b86fd106c3a2b2e9872e8215b5 Mon Sep 17 00:00:00 2001 From: Jon Leech Date: Sat, 22 Jul 2023 04:48:49 -0700 Subject: [PATCH] Update for Vulkan-Docs 1.3.259 --- include/vulkan/vulkan.hpp | 12 +++++------ include/vulkan/vulkan_core.h | 8 +++---- include/vulkan/vulkan_funcs.hpp | 8 +++---- include/vulkan/vulkan_handles.hpp | 6 +++--- include/vulkan/vulkan_raii.hpp | 18 ++++++++-------- registry/validusage.json | 36 +++++++++++++++---------------- registry/video.xml | 1 - registry/vk.xml | 8 +++---- 8 files changed, 48 insertions(+), 49 deletions(-) diff --git a/include/vulkan/vulkan.hpp b/include/vulkan/vulkan.hpp index f2e6e75..94968e9 100644 --- a/include/vulkan/vulkan.hpp +++ b/include/vulkan/vulkan.hpp @@ -114,7 +114,7 @@ extern "C" __declspec( dllimport ) FARPROC __stdcall GetProcAddress( HINSTANCE h # include #endif -static_assert( VK_HEADER_VERSION == 258, "Wrong VK_HEADER_VERSION!" ); +static_assert( VK_HEADER_VERSION == 259, "Wrong VK_HEADER_VERSION!" ); // 32-bit vulkan is not typesafe for non-dispatchable 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 @@ -5726,9 +5726,9 @@ namespace VULKAN_HPP_NAMESPACE } void - vkCmdUpdatePipelineIndirectBuffer( VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline ) const VULKAN_HPP_NOEXCEPT + vkCmdUpdatePipelineIndirectBufferNV( VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline ) const VULKAN_HPP_NOEXCEPT { - return ::vkCmdUpdatePipelineIndirectBuffer( commandBuffer, pipelineBindPoint, pipeline ); + return ::vkCmdUpdatePipelineIndirectBufferNV( commandBuffer, pipelineBindPoint, pipeline ); } VkDeviceAddress vkGetPipelineIndirectDeviceAddressNV( VkDevice device, const VkPipelineIndirectDeviceAddressInfoNV * pInfo ) const VULKAN_HPP_NOEXCEPT @@ -14403,7 +14403,7 @@ namespace VULKAN_HPP_NAMESPACE //=== VK_NV_device_generated_commands_compute === PFN_vkGetPipelineIndirectMemoryRequirementsNV vkGetPipelineIndirectMemoryRequirementsNV = 0; - PFN_vkCmdUpdatePipelineIndirectBuffer vkCmdUpdatePipelineIndirectBuffer = 0; + PFN_vkCmdUpdatePipelineIndirectBufferNV vkCmdUpdatePipelineIndirectBufferNV = 0; PFN_vkGetPipelineIndirectDeviceAddressNV vkGetPipelineIndirectDeviceAddressNV = 0; //=== VK_EXT_extended_dynamic_state3 === @@ -15714,7 +15714,7 @@ namespace VULKAN_HPP_NAMESPACE //=== VK_NV_device_generated_commands_compute === vkGetPipelineIndirectMemoryRequirementsNV = PFN_vkGetPipelineIndirectMemoryRequirementsNV( vkGetInstanceProcAddr( instance, "vkGetPipelineIndirectMemoryRequirementsNV" ) ); - vkCmdUpdatePipelineIndirectBuffer = PFN_vkCmdUpdatePipelineIndirectBuffer( vkGetInstanceProcAddr( instance, "vkCmdUpdatePipelineIndirectBuffer" ) ); + vkCmdUpdatePipelineIndirectBufferNV = PFN_vkCmdUpdatePipelineIndirectBufferNV( vkGetInstanceProcAddr( instance, "vkCmdUpdatePipelineIndirectBufferNV" ) ); vkGetPipelineIndirectDeviceAddressNV = PFN_vkGetPipelineIndirectDeviceAddressNV( vkGetInstanceProcAddr( instance, "vkGetPipelineIndirectDeviceAddressNV" ) ); @@ -16703,7 +16703,7 @@ namespace VULKAN_HPP_NAMESPACE //=== VK_NV_device_generated_commands_compute === vkGetPipelineIndirectMemoryRequirementsNV = PFN_vkGetPipelineIndirectMemoryRequirementsNV( vkGetDeviceProcAddr( device, "vkGetPipelineIndirectMemoryRequirementsNV" ) ); - vkCmdUpdatePipelineIndirectBuffer = PFN_vkCmdUpdatePipelineIndirectBuffer( vkGetDeviceProcAddr( device, "vkCmdUpdatePipelineIndirectBuffer" ) ); + vkCmdUpdatePipelineIndirectBufferNV = PFN_vkCmdUpdatePipelineIndirectBufferNV( vkGetDeviceProcAddr( device, "vkCmdUpdatePipelineIndirectBufferNV" ) ); vkGetPipelineIndirectDeviceAddressNV = PFN_vkGetPipelineIndirectDeviceAddressNV( vkGetDeviceProcAddr( device, "vkGetPipelineIndirectDeviceAddressNV" ) ); //=== VK_EXT_extended_dynamic_state3 === diff --git a/include/vulkan/vulkan_core.h b/include/vulkan/vulkan_core.h index b635c86..50a257b 100644 --- a/include/vulkan/vulkan_core.h +++ b/include/vulkan/vulkan_core.h @@ -69,7 +69,7 @@ extern "C" { #define VK_API_VERSION_1_0 VK_MAKE_API_VERSION(0, 1, 0, 0)// Patch version should always be set to 0 // Version of this file -#define VK_HEADER_VERSION 258 +#define VK_HEADER_VERSION 259 // Complete version of this file #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 3, VK_HEADER_VERSION) @@ -16429,7 +16429,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDecompressMemoryIndirectCountNV( // VK_NV_device_generated_commands_compute is a preprocessor guard. Do not pass it to API calls. #define VK_NV_device_generated_commands_compute 1 -#define VK_NV_DEVICE_GENERATED_COMMANDS_COMPUTE_SPEC_VERSION 1 +#define VK_NV_DEVICE_GENERATED_COMMANDS_COMPUTE_SPEC_VERSION 2 #define VK_NV_DEVICE_GENERATED_COMMANDS_COMPUTE_EXTENSION_NAME "VK_NV_device_generated_commands_compute" typedef struct VkPhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV { VkStructureType sType; @@ -16459,7 +16459,7 @@ typedef struct VkBindPipelineIndirectCommandNV { } VkBindPipelineIndirectCommandNV; typedef void (VKAPI_PTR *PFN_vkGetPipelineIndirectMemoryRequirementsNV)(VkDevice device, const VkComputePipelineCreateInfo* pCreateInfo, VkMemoryRequirements2* pMemoryRequirements); -typedef void (VKAPI_PTR *PFN_vkCmdUpdatePipelineIndirectBuffer)(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline); +typedef void (VKAPI_PTR *PFN_vkCmdUpdatePipelineIndirectBufferNV)(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline); typedef VkDeviceAddress (VKAPI_PTR *PFN_vkGetPipelineIndirectDeviceAddressNV)(VkDevice device, const VkPipelineIndirectDeviceAddressInfoNV* pInfo); #ifndef VK_NO_PROTOTYPES @@ -16468,7 +16468,7 @@ VKAPI_ATTR void VKAPI_CALL vkGetPipelineIndirectMemoryRequirementsNV( const VkComputePipelineCreateInfo* pCreateInfo, VkMemoryRequirements2* pMemoryRequirements); -VKAPI_ATTR void VKAPI_CALL vkCmdUpdatePipelineIndirectBuffer( +VKAPI_ATTR void VKAPI_CALL vkCmdUpdatePipelineIndirectBufferNV( VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline); diff --git a/include/vulkan/vulkan_funcs.hpp b/include/vulkan/vulkan_funcs.hpp index b8cee1b..f4334ea 100644 --- a/include/vulkan/vulkan_funcs.hpp +++ b/include/vulkan/vulkan_funcs.hpp @@ -21243,12 +21243,12 @@ namespace VULKAN_HPP_NAMESPACE #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */ template - VULKAN_HPP_INLINE void CommandBuffer::updatePipelineIndirectBuffer( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint, - VULKAN_HPP_NAMESPACE::Pipeline pipeline, - Dispatch const & d ) const VULKAN_HPP_NOEXCEPT + VULKAN_HPP_INLINE void CommandBuffer::updatePipelineIndirectBufferNV( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint, + VULKAN_HPP_NAMESPACE::Pipeline pipeline, + Dispatch const & d ) const VULKAN_HPP_NOEXCEPT { VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION ); - d.vkCmdUpdatePipelineIndirectBuffer( m_commandBuffer, static_cast( pipelineBindPoint ), static_cast( pipeline ) ); + d.vkCmdUpdatePipelineIndirectBufferNV( m_commandBuffer, static_cast( pipelineBindPoint ), static_cast( pipeline ) ); } template diff --git a/include/vulkan/vulkan_handles.hpp b/include/vulkan/vulkan_handles.hpp index f0545d9..9c6f0f6 100644 --- a/include/vulkan/vulkan_handles.hpp +++ b/include/vulkan/vulkan_handles.hpp @@ -5966,9 +5966,9 @@ namespace VULKAN_HPP_NAMESPACE //=== VK_NV_device_generated_commands_compute === template - void updatePipelineIndirectBuffer( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint, - VULKAN_HPP_NAMESPACE::Pipeline pipeline, - Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT; + void updatePipelineIndirectBufferNV( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint, + VULKAN_HPP_NAMESPACE::Pipeline pipeline, + Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT; //=== VK_EXT_extended_dynamic_state3 === diff --git a/include/vulkan/vulkan_raii.hpp b/include/vulkan/vulkan_raii.hpp index df3353f..741f69d 100644 --- a/include/vulkan/vulkan_raii.hpp +++ b/include/vulkan/vulkan_raii.hpp @@ -1576,7 +1576,7 @@ namespace VULKAN_HPP_NAMESPACE //=== VK_NV_device_generated_commands_compute === vkGetPipelineIndirectMemoryRequirementsNV = PFN_vkGetPipelineIndirectMemoryRequirementsNV( vkGetDeviceProcAddr( device, "vkGetPipelineIndirectMemoryRequirementsNV" ) ); - vkCmdUpdatePipelineIndirectBuffer = PFN_vkCmdUpdatePipelineIndirectBuffer( vkGetDeviceProcAddr( device, "vkCmdUpdatePipelineIndirectBuffer" ) ); + vkCmdUpdatePipelineIndirectBufferNV = PFN_vkCmdUpdatePipelineIndirectBufferNV( vkGetDeviceProcAddr( device, "vkCmdUpdatePipelineIndirectBufferNV" ) ); vkGetPipelineIndirectDeviceAddressNV = PFN_vkGetPipelineIndirectDeviceAddressNV( vkGetDeviceProcAddr( device, "vkGetPipelineIndirectDeviceAddressNV" ) ); @@ -2403,7 +2403,7 @@ namespace VULKAN_HPP_NAMESPACE //=== VK_NV_device_generated_commands_compute === PFN_vkGetPipelineIndirectMemoryRequirementsNV vkGetPipelineIndirectMemoryRequirementsNV = 0; - PFN_vkCmdUpdatePipelineIndirectBuffer vkCmdUpdatePipelineIndirectBuffer = 0; + PFN_vkCmdUpdatePipelineIndirectBufferNV vkCmdUpdatePipelineIndirectBufferNV = 0; PFN_vkGetPipelineIndirectDeviceAddressNV vkGetPipelineIndirectDeviceAddressNV = 0; //=== VK_EXT_extended_dynamic_state3 === @@ -5927,8 +5927,8 @@ namespace VULKAN_HPP_NAMESPACE //=== VK_NV_device_generated_commands_compute === - void updatePipelineIndirectBuffer( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint, - VULKAN_HPP_NAMESPACE::Pipeline pipeline ) const VULKAN_HPP_NOEXCEPT; + void updatePipelineIndirectBufferNV( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint, + VULKAN_HPP_NAMESPACE::Pipeline pipeline ) const VULKAN_HPP_NOEXCEPT; //=== VK_EXT_extended_dynamic_state3 === @@ -19766,13 +19766,13 @@ namespace VULKAN_HPP_NAMESPACE return structureChain; } - VULKAN_HPP_INLINE void CommandBuffer::updatePipelineIndirectBuffer( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint, - VULKAN_HPP_NAMESPACE::Pipeline pipeline ) const VULKAN_HPP_NOEXCEPT + VULKAN_HPP_INLINE void CommandBuffer::updatePipelineIndirectBufferNV( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint, + VULKAN_HPP_NAMESPACE::Pipeline pipeline ) const VULKAN_HPP_NOEXCEPT { - VULKAN_HPP_ASSERT( getDispatcher()->vkCmdUpdatePipelineIndirectBuffer && - "Function requires " ); + VULKAN_HPP_ASSERT( getDispatcher()->vkCmdUpdatePipelineIndirectBufferNV && + "Function requires " ); - getDispatcher()->vkCmdUpdatePipelineIndirectBuffer( + getDispatcher()->vkCmdUpdatePipelineIndirectBufferNV( static_cast( m_commandBuffer ), static_cast( pipelineBindPoint ), static_cast( pipeline ) ); } diff --git a/registry/validusage.json b/registry/validusage.json index f549b77..90e0d67 100644 --- a/registry/validusage.json +++ b/registry/validusage.json @@ -1,9 +1,9 @@ { "version info": { "schema version": 2, - "api version": "1.3.258", - "comment": "from git branch: github-main commit: 2c1e07a72b43f53cc7866c55ae32afe97d933621", - "date": "2023-07-21 09:57:58Z" + "api version": "1.3.259", + "comment": "from git branch: github-main commit: 3da7531f2f9d48993ab627c02a866479d5163ba4", + "date": "2023-07-22 10:52:33Z" }, "validation": { "vkGetInstanceProcAddr": { @@ -11570,54 +11570,54 @@ } ] }, - "vkCmdUpdatePipelineIndirectBuffer": { + "vkCmdUpdatePipelineIndirectBufferNV": { "core": [ { - "vuid": "VUID-vkCmdUpdatePipelineIndirectBuffer-pipelineBindPoint-09018", + "vuid": "VUID-vkCmdUpdatePipelineIndirectBufferNV-pipelineBindPoint-09018", "text": " pipelineBindPoint must be VK_PIPELINE_BIND_POINT_COMPUTE" }, { - "vuid": "VUID-vkCmdUpdatePipelineIndirectBuffer-pipeline-09019", + "vuid": "VUID-vkCmdUpdatePipelineIndirectBufferNV-pipeline-09019", "text": " pipeline must have been created with VK_PIPELINE_CREATE_INDIRECT_BINDABLE_BIT_NV flag set" }, { - "vuid": "VUID-vkCmdUpdatePipelineIndirectBuffer-pipeline-09020", + "vuid": "VUID-vkCmdUpdatePipelineIndirectBufferNV-pipeline-09020", "text": " pipeline must have been created with VkComputePipelineIndirectBufferInfoNV structure specifying a valid address where its metadata will be saved" }, { - "vuid": "VUID-vkCmdUpdatePipelineIndirectBuffer-deviceGeneratedComputePipelines-09021", + "vuid": "VUID-vkCmdUpdatePipelineIndirectBufferNV-deviceGeneratedComputePipelines-09021", "text": " The VkPhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV::deviceGeneratedComputePipelines feature must be enabled" }, { - "vuid": "VUID-vkCmdUpdatePipelineIndirectBuffer-commandBuffer-parameter", + "vuid": "VUID-vkCmdUpdatePipelineIndirectBufferNV-commandBuffer-parameter", "text": " commandBuffer must be a valid VkCommandBuffer handle" }, { - "vuid": "VUID-vkCmdUpdatePipelineIndirectBuffer-pipelineBindPoint-parameter", + "vuid": "VUID-vkCmdUpdatePipelineIndirectBufferNV-pipelineBindPoint-parameter", "text": " pipelineBindPoint must be a valid VkPipelineBindPoint value" }, { - "vuid": "VUID-vkCmdUpdatePipelineIndirectBuffer-pipeline-parameter", + "vuid": "VUID-vkCmdUpdatePipelineIndirectBufferNV-pipeline-parameter", "text": " pipeline must be a valid VkPipeline handle" }, { - "vuid": "VUID-vkCmdUpdatePipelineIndirectBuffer-commandBuffer-recording", + "vuid": "VUID-vkCmdUpdatePipelineIndirectBufferNV-commandBuffer-recording", "text": " commandBuffer must be in the recording state" }, { - "vuid": "VUID-vkCmdUpdatePipelineIndirectBuffer-commandBuffer-cmdpool", + "vuid": "VUID-vkCmdUpdatePipelineIndirectBufferNV-commandBuffer-cmdpool", "text": " The VkCommandPool that commandBuffer was allocated from must support transfer, graphics, or compute operations" }, { - "vuid": "VUID-vkCmdUpdatePipelineIndirectBuffer-renderpass", + "vuid": "VUID-vkCmdUpdatePipelineIndirectBufferNV-renderpass", "text": " This command must only be called outside of a render pass instance" }, { - "vuid": "VUID-vkCmdUpdatePipelineIndirectBuffer-videocoding", + "vuid": "VUID-vkCmdUpdatePipelineIndirectBufferNV-videocoding", "text": " This command must only be called outside of a video coding scope" }, { - "vuid": "VUID-vkCmdUpdatePipelineIndirectBuffer-commonparent", + "vuid": "VUID-vkCmdUpdatePipelineIndirectBufferNV-commonparent", "text": " Both of commandBuffer, and pipeline must have been created, allocated, or retrieved from the same VkDevice" } ] @@ -58638,7 +58638,7 @@ }, { "vuid": "VUID-VkBindPipelineIndirectCommandNV-None-09093", - "text": " The referenced pipeline must have been updated with vkCmdUpdatePipelineIndirectBuffer" + "text": " The referenced pipeline must have been updated with vkCmdUpdatePipelineIndirectBufferNV" }, { "vuid": "VUID-VkBindPipelineIndirectCommandNV-None-09094", @@ -60202,7 +60202,7 @@ }, { "vuid": "VUID-VkGeneratedCommandsInfoNV-pipelineBindPoint-09086", - "text": " If pipelineBindPoint is of type VK_PIPELINE_BIND_POINT_COMPUTE, then vkCmdUpdatePipelineIndirectBuffer must have been called on that pipeline to save its metadata to a device address" + "text": " If pipelineBindPoint is of type VK_PIPELINE_BIND_POINT_COMPUTE, then vkCmdUpdatePipelineIndirectBufferNV must have been called on that pipeline to save its metadata to a device address" }, { "vuid": "VUID-VkGeneratedCommandsInfoNV-pipelineBindPoint-09087", diff --git a/registry/video.xml b/registry/video.xml index 11b70ca..bb534c3 100644 --- a/registry/video.xml +++ b/registry/video.xml @@ -1167,7 +1167,6 @@ The current public version of video.xml is maintained in the default branch - diff --git a/registry/vk.xml b/registry/vk.xml index f8e93be..5488ca7 100644 --- a/registry/vk.xml +++ b/registry/vk.xml @@ -175,7 +175,7 @@ branch of the member gitlab server. #define VKSC_API_VERSION_1_0 VK_MAKE_API_VERSION(VKSC_API_VARIANT, 1, 0, 0)// Patch version should always be set to 0 // Version of this file -#define VK_HEADER_VERSION 258 +#define VK_HEADER_VERSION 259 // Complete version of this file #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 3, VK_HEADER_VERSION) // Version of this file @@ -11403,7 +11403,7 @@ typedef void* MTLSharedEvent_id; VkDeviceSize offset - void vkCmdUpdatePipelineIndirectBuffer + void vkCmdUpdatePipelineIndirectBufferNV VkCommandBuffer commandBuffer VkPipelineBindPoint pipelineBindPoint VkPipeline pipeline @@ -21698,7 +21698,7 @@ typedef void* MTLSharedEvent_id; - + @@ -21711,7 +21711,7 @@ typedef void* MTLSharedEvent_id; - +