mirror of
https://github.com/KhronosGroup/Vulkan-Hpp.git
synced 2024-10-14 16:32:17 +00:00
Fix allocator name in generateCommandResultEnumerateChained()
+ correctly format vulkan_structs.hpp
This commit is contained in:
parent
323c921a19
commit
75bf4a0f93
@ -3027,10 +3027,11 @@ std::string
|
|||||||
R"( template <typename StructureChain, typename StructureChainAllocator = std::allocator<StructureChain>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE${typenameCheck}>
|
R"( template <typename StructureChain, typename StructureChainAllocator = std::allocator<StructureChain>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE${typenameCheck}>
|
||||||
${nodiscard}std::vector<StructureChain, StructureChainAllocator> ${commandName}( ${argumentList} )${const};)";
|
${nodiscard}std::vector<StructureChain, StructureChainAllocator> ${commandName}( ${argumentList} )${const};)";
|
||||||
|
|
||||||
std::string typenameCheck = withAllocator ? ( ", typename B = " + allocatorType +
|
std::string typenameCheck =
|
||||||
", typename std::enable_if<std::is_same<typename B::value_type, " +
|
withAllocator
|
||||||
vectorElementType + ">::value, int>::type = 0" )
|
? ( ", typename B = StructureChainAllocator, typename std::enable_if<std::is_same<typename B::value_type, " +
|
||||||
: "";
|
vectorElementType + ">::value, int>::type = 0" )
|
||||||
|
: "";
|
||||||
|
|
||||||
return replaceWithMap( functionTemplate,
|
return replaceWithMap( functionTemplate,
|
||||||
{ { "argumentList", argumentList },
|
{ { "argumentList", argumentList },
|
||||||
@ -8458,11 +8459,7 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultMultiSuccessWithE
|
|||||||
VULKAN_HPP_NODISCARD std::vector<StructureChain<X, Y, Z...>> ${commandName}( ${argumentList} ) const;
|
VULKAN_HPP_NODISCARD std::vector<StructureChain<X, Y, Z...>> ${commandName}( ${argumentList} ) const;
|
||||||
)";
|
)";
|
||||||
|
|
||||||
return replaceWithMap( declarationTemplate,
|
return replaceWithMap( declarationTemplate, { { "argumentList", argumentList }, { "commandName", commandName } } );
|
||||||
{
|
|
||||||
{ "argumentList", argumentList },
|
|
||||||
{ "commandName", commandName }
|
|
||||||
} );
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user