mirror/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2024-10-14 16:32:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #756 from asuessenbach/allocator

Browse Source 
Correct actual name of vectorAllocator in generated function bodies.
This commit is contained in:
Andreas Süßenbach 2020-09-30 10:16:19 +02:00 committed by GitHub
commit d9f768874c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
VulkanHppGenerator.cpp
View File

@ -4277,6 +4277,7 @@ std::string VulkanHppGenerator::constructCommandEnumerateVoid( std::string const
return ${vectorName}; return ${vectorName};
})"; })";
std::string vectorName = startLowerCase( stripPrefix( commandData.params[vectorParamIndex.first].name, "p" ) );
std::string withAllocatorsTypenameCheck = std::string withAllocatorsTypenameCheck =
", typename B, typename std::enable_if<std::is_same<typename B::value_type, " + vectorElementType + ", typename B, typename std::enable_if<std::is_same<typename B::value_type, " + vectorElementType +
">::value, int>::type "; ">::value, int>::type ";
@ -4293,9 +4294,9 @@ std::string VulkanHppGenerator::constructCommandEnumerateVoid( std::string const
constructCallArgumentsEnumerateVectors( commandData.params, { vectorParamIndex }, true ) }, constructCallArgumentsEnumerateVectors( commandData.params, { vectorParamIndex }, true ) },
{ "secondCallArguments", { "secondCallArguments",
constructCallArgumentsEnumerateVectors( commandData.params, { vectorParamIndex }, false ) }, constructCallArgumentsEnumerateVectors( commandData.params, { vectorParamIndex }, false ) },
{ "vectorAllocator", withAllocators ? ( "( " + vectorElementType + "Allocator )" ) : "" }, { "vectorAllocator", withAllocators ? ( "( " + vectorName + "Allocator )" ) : "" },
{ "vectorElementType", vectorElementType }, { "vectorElementType", vectorElementType },
{ "vectorName", startLowerCase( stripPrefix( commandData.params[vectorParamIndex.first].name, "p" ) ) }, { "vectorName", vectorName },
{ "vkCommand", name }, { "vkCommand", name },
{ "withAllocatorTypenameCheck", withAllocators ? withAllocatorsTypenameCheck : "" } } ) ); { "withAllocatorTypenameCheck", withAllocators ? withAllocatorsTypenameCheck : "" } } ) );
} }

25
vulkan/vulkan.hpp
View File

@ -97663,7 +97663,7 @@ namespace VULKAN_HPP_NAMESPACE
Dispatch const & d ) const Dispatch const & d ) const
{ {
std::vector<SparseImageMemoryRequirements, SparseImageMemoryRequirementsAllocator> sparseMemoryRequirements( std::vector<SparseImageMemoryRequirements, SparseImageMemoryRequirementsAllocator> sparseMemoryRequirements(
SparseImageMemoryRequirementsAllocator ); sparseMemoryRequirementsAllocator );
uint32_t sparseMemoryRequirementCount; uint32_t sparseMemoryRequirementCount;
d.vkGetImageSparseMemoryRequirements( d.vkGetImageSparseMemoryRequirements(
m_device, static_cast<VkImage>( image ), &sparseMemoryRequirementCount, nullptr ); m_device, static_cast<VkImage>( image ), &sparseMemoryRequirementCount, nullptr );
@ -97728,7 +97728,7 @@ namespace VULKAN_HPP_NAMESPACE
Dispatch const & d ) const Dispatch const & d ) const
{ {
std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements( std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements(
SparseImageMemoryRequirements2Allocator ); sparseMemoryRequirementsAllocator );
uint32_t sparseMemoryRequirementCount; uint32_t sparseMemoryRequirementCount;
d.vkGetImageSparseMemoryRequirements2( m_device, d.vkGetImageSparseMemoryRequirements2( m_device,
reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( &info ), reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( &info ),
@ -97795,7 +97795,7 @@ namespace VULKAN_HPP_NAMESPACE
Dispatch const & d ) const Dispatch const & d ) const
{ {
std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements( std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements(
SparseImageMemoryRequirements2Allocator ); sparseMemoryRequirementsAllocator );
uint32_t sparseMemoryRequirementCount; uint32_t sparseMemoryRequirementCount;
d.vkGetImageSparseMemoryRequirements2KHR( m_device, d.vkGetImageSparseMemoryRequirements2KHR( m_device,
reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( &info ), reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( &info ),
@ -103440,7 +103440,7 @@ namespace VULKAN_HPP_NAMESPACE
Dispatch const & d ) const Dispatch const & d ) const
{ {
std::vector<QueueFamilyProperties, QueueFamilyPropertiesAllocator> queueFamilyProperties( std::vector<QueueFamilyProperties, QueueFamilyPropertiesAllocator> queueFamilyProperties(
QueueFamilyPropertiesAllocator ); queueFamilyPropertiesAllocator );
uint32_t queueFamilyPropertyCount; uint32_t queueFamilyPropertyCount;
d.vkGetPhysicalDeviceQueueFamilyProperties( m_physicalDevice, &queueFamilyPropertyCount, nullptr ); d.vkGetPhysicalDeviceQueueFamilyProperties( m_physicalDevice, &queueFamilyPropertyCount, nullptr );
queueFamilyProperties.resize( queueFamilyPropertyCount ); queueFamilyProperties.resize( queueFamilyPropertyCount );
@ -103709,9 +103709,8 @@ namespace VULKAN_HPP_NAMESPACE
SparseImageFormatPropertiesAllocator & propertiesAllocator, SparseImageFormatPropertiesAllocator & propertiesAllocator,
Dispatch const & d ) const Dispatch const & d ) const
{ {
std::vector<SparseImageFormatProperties, SparseImageFormatPropertiesAllocator> properties( std::vector<SparseImageFormatProperties, SparseImageFormatPropertiesAllocator> properties( propertiesAllocator );
SparseImageFormatPropertiesAllocator ); uint32_t propertyCount;
uint32_t propertyCount;
d.vkGetPhysicalDeviceSparseImageFormatProperties( m_physicalDevice, d.vkGetPhysicalDeviceSparseImageFormatProperties( m_physicalDevice,
static_cast<VkFormat>( format ), static_cast<VkFormat>( format ),
static_cast<VkImageType>( type ), static_cast<VkImageType>( type ),
@ -103784,9 +103783,8 @@ namespace VULKAN_HPP_NAMESPACE
SparseImageFormatProperties2Allocator & propertiesAllocator, SparseImageFormatProperties2Allocator & propertiesAllocator,
Dispatch const & d ) const Dispatch const & d ) const
{ {
std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator> properties( std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator> properties( propertiesAllocator );
SparseImageFormatProperties2Allocator ); uint32_t propertyCount;
uint32_t propertyCount;
d.vkGetPhysicalDeviceSparseImageFormatProperties2( d.vkGetPhysicalDeviceSparseImageFormatProperties2(
m_physicalDevice, m_physicalDevice,
reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( &formatInfo ), reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( &formatInfo ),
@ -103852,9 +103850,8 @@ namespace VULKAN_HPP_NAMESPACE
SparseImageFormatProperties2Allocator & propertiesAllocator, SparseImageFormatProperties2Allocator & propertiesAllocator,
Dispatch const & d ) const Dispatch const & d ) const
{ {
std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator> properties( std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator> properties( propertiesAllocator );
SparseImageFormatProperties2Allocator ); uint32_t propertyCount;
uint32_t propertyCount;
d.vkGetPhysicalDeviceSparseImageFormatProperties2KHR( d.vkGetPhysicalDeviceSparseImageFormatProperties2KHR(
m_physicalDevice, m_physicalDevice,
reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( &formatInfo ), reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( &formatInfo ),
@ -104635,7 +104632,7 @@ namespace VULKAN_HPP_NAMESPACE
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<CheckpointDataNV, CheckpointDataNVAllocator> VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<CheckpointDataNV, CheckpointDataNVAllocator>
Queue::getCheckpointDataNV( CheckpointDataNVAllocator & checkpointDataAllocator, Dispatch const & d ) const Queue::getCheckpointDataNV( CheckpointDataNVAllocator & checkpointDataAllocator, Dispatch const & d ) const
{ {
std::vector<CheckpointDataNV, CheckpointDataNVAllocator> checkpointData( CheckpointDataNVAllocator ); std::vector<CheckpointDataNV, CheckpointDataNVAllocator> checkpointData( checkpointDataAllocator );
uint32_t checkpointDataCount; uint32_t checkpointDataCount;
d.vkGetQueueCheckpointDataNV( m_queue, &checkpointDataCount, nullptr ); d.vkGetQueueCheckpointDataNV( m_queue, &checkpointDataCount, nullptr );
checkpointData.resize( checkpointDataCount ); checkpointData.resize( checkpointDataCount );