diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index c088233..d3602cc 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -4277,6 +4277,7 @@ std::string VulkanHppGenerator::constructCommandEnumerateVoid( std::string const return ${vectorName}; })"; + std::string vectorName = startLowerCase( stripPrefix( commandData.params[vectorParamIndex.first].name, "p" ) ); std::string withAllocatorsTypenameCheck = ", typename B, typename std::enable_if::value, int>::type "; @@ -4293,9 +4294,9 @@ std::string VulkanHppGenerator::constructCommandEnumerateVoid( std::string const constructCallArgumentsEnumerateVectors( commandData.params, { vectorParamIndex }, true ) }, { "secondCallArguments", constructCallArgumentsEnumerateVectors( commandData.params, { vectorParamIndex }, false ) }, - { "vectorAllocator", withAllocators ? ( "( " + vectorElementType + "Allocator )" ) : "" }, + { "vectorAllocator", withAllocators ? ( "( " + vectorName + "Allocator )" ) : "" }, { "vectorElementType", vectorElementType }, - { "vectorName", startLowerCase( stripPrefix( commandData.params[vectorParamIndex.first].name, "p" ) ) }, + { "vectorName", vectorName }, { "vkCommand", name }, { "withAllocatorTypenameCheck", withAllocators ? withAllocatorsTypenameCheck : "" } } ) ); } diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index 41d350f..0ef458b 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -97663,7 +97663,7 @@ namespace VULKAN_HPP_NAMESPACE Dispatch const & d ) const { std::vector sparseMemoryRequirements( - SparseImageMemoryRequirementsAllocator ); + sparseMemoryRequirementsAllocator ); uint32_t sparseMemoryRequirementCount; d.vkGetImageSparseMemoryRequirements( m_device, static_cast( image ), &sparseMemoryRequirementCount, nullptr ); @@ -97728,7 +97728,7 @@ namespace VULKAN_HPP_NAMESPACE Dispatch const & d ) const { std::vector sparseMemoryRequirements( - SparseImageMemoryRequirements2Allocator ); + sparseMemoryRequirementsAllocator ); uint32_t sparseMemoryRequirementCount; d.vkGetImageSparseMemoryRequirements2( m_device, reinterpret_cast( &info ), @@ -97795,7 +97795,7 @@ namespace VULKAN_HPP_NAMESPACE Dispatch const & d ) const { std::vector sparseMemoryRequirements( - SparseImageMemoryRequirements2Allocator ); + sparseMemoryRequirementsAllocator ); uint32_t sparseMemoryRequirementCount; d.vkGetImageSparseMemoryRequirements2KHR( m_device, reinterpret_cast( &info ), @@ -103440,7 +103440,7 @@ namespace VULKAN_HPP_NAMESPACE Dispatch const & d ) const { std::vector queueFamilyProperties( - QueueFamilyPropertiesAllocator ); + queueFamilyPropertiesAllocator ); uint32_t queueFamilyPropertyCount; d.vkGetPhysicalDeviceQueueFamilyProperties( m_physicalDevice, &queueFamilyPropertyCount, nullptr ); queueFamilyProperties.resize( queueFamilyPropertyCount ); @@ -103709,9 +103709,8 @@ namespace VULKAN_HPP_NAMESPACE SparseImageFormatPropertiesAllocator & propertiesAllocator, Dispatch const & d ) const { - std::vector properties( - SparseImageFormatPropertiesAllocator ); - uint32_t propertyCount; + std::vector properties( propertiesAllocator ); + uint32_t propertyCount; d.vkGetPhysicalDeviceSparseImageFormatProperties( m_physicalDevice, static_cast( format ), static_cast( type ), @@ -103784,9 +103783,8 @@ namespace VULKAN_HPP_NAMESPACE SparseImageFormatProperties2Allocator & propertiesAllocator, Dispatch const & d ) const { - std::vector properties( - SparseImageFormatProperties2Allocator ); - uint32_t propertyCount; + std::vector properties( propertiesAllocator ); + uint32_t propertyCount; d.vkGetPhysicalDeviceSparseImageFormatProperties2( m_physicalDevice, reinterpret_cast( &formatInfo ), @@ -103852,9 +103850,8 @@ namespace VULKAN_HPP_NAMESPACE SparseImageFormatProperties2Allocator & propertiesAllocator, Dispatch const & d ) const { - std::vector properties( - SparseImageFormatProperties2Allocator ); - uint32_t propertyCount; + std::vector properties( propertiesAllocator ); + uint32_t propertyCount; d.vkGetPhysicalDeviceSparseImageFormatProperties2KHR( m_physicalDevice, reinterpret_cast( &formatInfo ), @@ -104635,7 +104632,7 @@ namespace VULKAN_HPP_NAMESPACE VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector Queue::getCheckpointDataNV( CheckpointDataNVAllocator & checkpointDataAllocator, Dispatch const & d ) const { - std::vector checkpointData( CheckpointDataNVAllocator ); + std::vector checkpointData( checkpointDataAllocator ); uint32_t checkpointDataCount; d.vkGetQueueCheckpointDataNV( m_queue, &checkpointDataCount, nullptr ); checkpointData.resize( checkpointDataCount );