mewin/vulkan-hpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct actual name of vectorAllocator in generated function bodies.

Browse Source
This commit is contained in:
asuessenbach 2020-09-30 09:13:44 +02:00
parent 2c1050518a
commit a77b68ce05
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};
})";
std::string vectorName = startLowerCase( stripPrefix( commandData.params[vectorParamIndex.first].name, "p" ) );
std::string withAllocatorsTypenameCheck =
", typename B, typename std::enable_if<std::is_same<typename B::value_type, " + vectorElementType +
">::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 : "" } } ) );
}

19
vulkan/vulkan.hpp
View File

@ -97660,7 +97660,7 @@ namespace VULKAN_HPP_NAMESPACE
Dispatch const & d ) const
{
std::vector<SparseImageMemoryRequirements, SparseImageMemoryRequirementsAllocator> sparseMemoryRequirements(
SparseImageMemoryRequirementsAllocator );
sparseMemoryRequirementsAllocator );
uint32_t sparseMemoryRequirementCount;
d.vkGetImageSparseMemoryRequirements(
m_device, static_cast<VkImage>( image ), &sparseMemoryRequirementCount, nullptr );
@ -97725,7 +97725,7 @@ namespace VULKAN_HPP_NAMESPACE
Dispatch const & d ) const
{
std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements(
SparseImageMemoryRequirements2Allocator );
sparseMemoryRequirementsAllocator );
uint32_t sparseMemoryRequirementCount;
d.vkGetImageSparseMemoryRequirements2( m_device,
reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( &info ),
@ -97792,7 +97792,7 @@ namespace VULKAN_HPP_NAMESPACE
Dispatch const & d ) const
{
std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements(
SparseImageMemoryRequirements2Allocator );
sparseMemoryRequirementsAllocator );
uint32_t sparseMemoryRequirementCount;
d.vkGetImageSparseMemoryRequirements2KHR( m_device,
reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( &info ),
@ -103437,7 +103437,7 @@ namespace VULKAN_HPP_NAMESPACE
Dispatch const & d ) const
{
std::vector<QueueFamilyProperties, QueueFamilyPropertiesAllocator> queueFamilyProperties(
QueueFamilyPropertiesAllocator );
queueFamilyPropertiesAllocator );
uint32_t queueFamilyPropertyCount;
d.vkGetPhysicalDeviceQueueFamilyProperties( m_physicalDevice, &queueFamilyPropertyCount, nullptr );
queueFamilyProperties.resize( queueFamilyPropertyCount );
@ -103706,8 +103706,7 @@ namespace VULKAN_HPP_NAMESPACE
SparseImageFormatPropertiesAllocator & propertiesAllocator,
Dispatch const & d ) const
{
std::vector<SparseImageFormatProperties, SparseImageFormatPropertiesAllocator> properties(
SparseImageFormatPropertiesAllocator );
std::vector<SparseImageFormatProperties, SparseImageFormatPropertiesAllocator> properties( propertiesAllocator );
uint32_t propertyCount;
d.vkGetPhysicalDeviceSparseImageFormatProperties( m_physicalDevice,
static_cast<VkFormat>( format ),
@ -103781,8 +103780,7 @@ namespace VULKAN_HPP_NAMESPACE
SparseImageFormatProperties2Allocator & propertiesAllocator,
Dispatch const & d ) const
{
std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator> properties(
SparseImageFormatProperties2Allocator );
std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator> properties( propertiesAllocator );
uint32_t propertyCount;
d.vkGetPhysicalDeviceSparseImageFormatProperties2(
m_physicalDevice,
@ -103849,8 +103847,7 @@ namespace VULKAN_HPP_NAMESPACE
SparseImageFormatProperties2Allocator & propertiesAllocator,
Dispatch const & d ) const
{
std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator> properties(
SparseImageFormatProperties2Allocator );
std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator> properties( propertiesAllocator );
uint32_t propertyCount;
d.vkGetPhysicalDeviceSparseImageFormatProperties2KHR(
m_physicalDevice,
@ -104632,7 +104629,7 @@ namespace VULKAN_HPP_NAMESPACE
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<CheckpointDataNV, CheckpointDataNVAllocator>
Queue::getCheckpointDataNV( CheckpointDataNVAllocator & checkpointDataAllocator, Dispatch const & d ) const
{
std::vector<CheckpointDataNV, CheckpointDataNVAllocator> checkpointData( CheckpointDataNVAllocator );
std::vector<CheckpointDataNV, CheckpointDataNVAllocator> checkpointData( checkpointDataAllocator );
uint32_t checkpointDataCount;
d.vkGetQueueCheckpointDataNV( m_queue, &checkpointDataCount, nullptr );
checkpointData.resize( checkpointDataCount );