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 #898 from asuessenbach/inline

Browse Source 
Add missing VULKAN_HPP_INLINE to function definitions
This commit is contained in:
Andreas Süßenbach 2021-03-03 08:21:18 +01:00 committed by GitHub
commit 1db86d0204
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 219 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
VulkanHppGenerator.cpp
View File

@ -7167,7 +7167,7 @@ ${leave})";
const std::string definitionTemplate = const std::string definitionTemplate =
R"( R"(
${enter} VULKAN_HPP_NODISCARD std::vector<${vectorElementType}> ${className}::${commandName}( ${argumentList} ) const ${enter} VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<${vectorElementType}> ${className}::${commandName}( ${argumentList} ) const
{ {
std::vector<${vectorElementType}> ${vectorName}; std::vector<${vectorElementType}> ${vectorName};
${counterType} ${counterName}; ${counterType} ${counterName};
@ -7259,7 +7259,7 @@ ${leave})";
const std::string definitionTemplate = const std::string definitionTemplate =
R"( R"(
${enter} VULKAN_HPP_NODISCARD std::pair<std::vector<${firstType}>, std::vector<${secondType}>> ${className}::${commandName}( ${argumentList} ) const ${enter} VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair<std::vector<${firstType}>, std::vector<${secondType}>> ${className}::${commandName}( ${argumentList} ) const
{ {
std::pair<std::vector<${firstType}>, std::vector<${secondType}>> data; std::pair<std::vector<${firstType}>, std::vector<${secondType}>> data;
std::vector<${firstType}> & ${firstVectorName} = data.first; std::vector<${firstType}> & ${firstVectorName} = data.first;
@ -7412,7 +7412,7 @@ ${leave})";
std::string const definitionTemplate = std::string const definitionTemplate =
R"( R"(
${enter} VULKAN_HPP_NODISCARD std::pair<VULKAN_HPP_NAMESPACE::Result, ${returnType}> ${className}::${commandName}( ${argumentList} ) const ${enter} VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair<VULKAN_HPP_NAMESPACE::Result, ${returnType}> ${className}::${commandName}( ${argumentList} ) const
{ {
${returnType} ${valueName}; ${returnType} ${valueName};
VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->${vkCommand}( ${callArguments} ) ); VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->${vkCommand}( ${callArguments} ) );
@ -7476,7 +7476,7 @@ ${leave})";
std::string const definitionTemplate = std::string const definitionTemplate =
R"( R"(
${enter} template <typename T> ${enter} template <typename T>
VULKAN_HPP_NODISCARD std::pair<VULKAN_HPP_NAMESPACE::Result, std::vector<T>> ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair<VULKAN_HPP_NAMESPACE::Result, std::vector<T>> ${className}::${commandName}( ${argumentList} ) const
{ {
VULKAN_HPP_ASSERT( ${dataSize} % sizeof( T ) == 0 ); VULKAN_HPP_ASSERT( ${dataSize} % sizeof( T ) == 0 );
std::vector<T> ${dataName}( ${dataSize} / sizeof( T ) ); std::vector<T> ${dataName}( ${dataSize} / sizeof( T ) );
@ -7800,7 +7800,7 @@ ${leave})";
std::string const definitionTemplate = std::string const definitionTemplate =
R"( R"(
${enter} VULKAN_HPP_NODISCARD std::pair<std::vector<${vectorElementType}>, ${valueType}> ${className}::${commandName}( ${argumentList} ) const ${enter} VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair<std::vector<${vectorElementType}>, ${valueType}> ${className}::${commandName}( ${argumentList} ) const
{ {
std::pair<std::vector<${vectorElementType}>, ${valueType}> data( std::piecewise_construct, std::forward_as_tuple( ${vectorSize} ), std::forward_as_tuple( 0 ) ); std::pair<std::vector<${vectorElementType}>, ${valueType}> data( std::piecewise_construct, std::forward_as_tuple( ${vectorSize} ), std::forward_as_tuple( 0 ) );
std::vector<${vectorElementType}> & ${vectorName} = data.first; std::vector<${vectorElementType}> & ${vectorName} = data.first;
@ -7869,7 +7869,7 @@ ${leave})";
std::string const definitionTemplate = std::string const definitionTemplate =
R"( R"(
${enter} template <typename T> ${enter} template <typename T>
VULKAN_HPP_NODISCARD std::vector<T> ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<T> ${className}::${commandName}( ${argumentList} ) const
{ {
VULKAN_HPP_ASSERT( ${dataSize} % sizeof( T ) == 0 ); VULKAN_HPP_ASSERT( ${dataSize} % sizeof( T ) == 0 );
std::vector<T> ${dataName}( ${dataSize} / sizeof( T ) ); std::vector<T> ${dataName}( ${dataSize} / sizeof( T ) );
@ -8060,7 +8060,7 @@ ${leave})";
std::string const definitionTemplate = std::string const definitionTemplate =
R"( R"(
${enter} VULKAN_HPP_NODISCARD ${returnType} ${className}::${commandName}( ${argumentList} ) const ${enter} VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ${returnType} ${className}::${commandName}( ${argumentList} ) const
{ {
${returnType} ${valueName}; ${returnType} ${valueName};
VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->${vkCommand}( ${callArguments} ) ); VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->${vkCommand}( ${callArguments} ) );
@ -8477,7 +8477,7 @@ ${leave})";
std::string const definitionTemplate = std::string const definitionTemplate =
R"( R"(
${enter} VULKAN_HPP_NODISCARD std::pair<Bool32,${returnType}> ${className}::${commandName}( ${argumentList} ) const ${noexcept} ${enter} VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair<Bool32,${returnType}> ${className}::${commandName}( ${argumentList} ) const ${noexcept}
{${vectorSizeCheck} {${vectorSizeCheck}
std::pair<Bool32,${returnType}> result; std::pair<Bool32,${returnType}> result;
${returnType} & ${returnVariable} = result.second; ${returnType} & ${returnVariable} = result.second;
@ -8568,7 +8568,7 @@ ${leave})";
std::string const definitionTemplate = std::string const definitionTemplate =
R"( R"(
${enter} VULKAN_HPP_NODISCARD ${returnType} ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT ${enter} VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ${returnType} ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT
{${vectorSizeCheck} {${vectorSizeCheck}
return getDispatcher()->${vkCommand}( ${callArguments} ); return getDispatcher()->${vkCommand}( ${callArguments} );
} }
@ -8764,7 +8764,7 @@ ${leave})";
const std::string definitionTemplate = const std::string definitionTemplate =
R"( R"(
${enter} VULKAN_HPP_NODISCARD std::vector<${vectorElementType}> ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT ${enter} VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<${vectorElementType}> ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT
{ {
${counterType} ${counterName}; ${counterType} ${counterName};
getDispatcher()->${vkCommand}( ${firstCallArguments} ); getDispatcher()->${vkCommand}( ${firstCallArguments} );
@ -8834,7 +8834,7 @@ ${leave})";
const std::string definitionTemplate = const std::string definitionTemplate =
R"( R"(
${enter} template <typename StructureChain> ${enter} template <typename StructureChain>
VULKAN_HPP_NODISCARD std::vector<StructureChain> ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<StructureChain> ${className}::${commandName}( ${argumentList} ) const
{ {
${counterType} ${counterName}; ${counterType} ${counterName};
getDispatcher()->${vkCommand}( ${firstCallArguments} ); getDispatcher()->${vkCommand}( ${firstCallArguments} );
@ -8909,7 +8909,7 @@ ${leave})";
std::string const definitionTemplate = std::string const definitionTemplate =
R"( R"(
${enter} template <typename X, typename Y, typename... Z> ${enter} template <typename X, typename Y, typename... Z>
VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT
{ {
StructureChain<X, Y, Z...> structureChain; StructureChain<X, Y, Z...> structureChain;
${returnType} & ${returnVariable} = structureChain.template get<${returnType}>(); ${returnType} & ${returnVariable} = structureChain.template get<${returnType}>();
@ -8972,7 +8972,7 @@ ${leave})";
std::string const definitionTemplate = std::string const definitionTemplate =
R"( R"(
${enter} VULKAN_HPP_NODISCARD ${returnType} ${className}::${commandName}( ${argumentList} ) const ${noexcept} ${enter} VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ${returnType} ${className}::${commandName}( ${argumentList} ) const ${noexcept}
{${vectorSizeCheck} {${vectorSizeCheck}
${returnType} ${returnVariable}; ${returnType} ${returnVariable};
getDispatcher()->${vkCommand}( ${callArguments} ); getDispatcher()->${vkCommand}( ${callArguments} );
@ -15457,7 +15457,7 @@ namespace VULKAN_HPP_NAMESPACE
#if !defined(VULKAN_HPP_DISABLE_ENHANCED_MODE) && !defined(VULKAN_HPP_NO_EXCEPTIONS) #if !defined(VULKAN_HPP_DISABLE_ENHANCED_MODE) && !defined(VULKAN_HPP_NO_EXCEPTIONS)
template <class T, class U = T> template <class T, class U = T>
VULKAN_HPP_CONSTEXPR_14 T exchange( T & obj, U && newValue ) VULKAN_HPP_CONSTEXPR_14 VULKAN_HPP_INLINE T exchange( T & obj, U && newValue )
{ {
# if ( 14 <= VULKAN_HPP_CPP_VERSION ) # if ( 14 <= VULKAN_HPP_CPP_VERSION )
return std::exchange<T>( obj, std::forward<U>( newValue ) ); return std::exchange<T>( obj, std::forward<U>( newValue ) );

281
vulkan/vulkan_raii.hpp
View File

File diff suppressed because it is too large Load Diff