mirror/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2024-09-20 05:52:16 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1138 from asuessenbach/fix

Browse Source 
Fix allocator name in generateCommandResultEnumerateChained()
This commit is contained in:
Andreas Süßenbach 2021-11-16 08:30:39 +01:00 committed by GitHub
commit f727d2a43c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2085 additions and 2085 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
VulkanHppGenerator.cpp
View File

@ -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 }
} );
} }
} }

4155
vulkan/vulkan_structs.hpp
View File

File diff suppressed because it is too large Load Diff