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 #742 from asuessenbach/refactor

Browse Source 
refactor generation of simple void-functions
This commit is contained in:
Andreas Süßenbach 2020-09-22 08:40:45 +02:00 committed by GitHub
commit 1c6a7b81ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 539 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

217
VulkanHppGenerator.cpp
View File

@ -1234,30 +1234,44 @@ void VulkanHppGenerator::appendCommand( std::string & str,
{ {
// no return parameter // no return parameter
std::vector<size_t> constPointerParamIndices = determineConstPointerParamIndices( commandData.params ); std::vector<size_t> constPointerParamIndices = determineConstPointerParamIndices( commandData.params );
#if 0 if ( !constPointerParamIndices.empty() )
if ( !constPointerParamIndices.empty() &&
( std::find_if(
constPointerParamIndices.begin(), constPointerParamIndices.end(), [&commandData]( size_t idx ) {
return commandData.params[idx].type.type == "void";
} ) == constPointerParamIndices.end() ) )
#else
if ( !constPointerParamIndices.empty() && ( commandData.successCodes.size() == 1 ) )
#endif
{ {
// no pointer-in parameter and just one success code // with const-pointer(s),
appendCommandSimple( str, name, commandData, definition ); switch ( commandData.successCodes.size() )
return; {
case 0:
// no success codes at all
if ( ( commandData.returnType == "void" ) &&
std::find_if(
constPointerParamIndices.begin(), constPointerParamIndices.end(), [&commandData]( size_t idx ) {
return commandData.params[idx].type.type == "void";
} ) == constPointerParamIndices.end() )
{
// command returns void, and the const pointer(s) are void-pointers and thus can't be change from
// by-pointer to by-reference
appendCommandSimpleVoid( str, name, commandData, definition );
return;
}
break;
case 1:
// just one success code
appendCommandSimple( str, name, commandData, definition );
return;
default: break;
}
} }
} }
} }
break; break;
case 1: case 1:
{ {
// just one vector parameter
auto vectorParamIndexIt = vectorParamIndices.begin(); auto vectorParamIndexIt = vectorParamIndices.begin();
if ( commandData.params[vectorParamIndexIt->first].type.isNonConstPointer() && if ( commandData.params[vectorParamIndexIt->first].type.isNonConstPointer() &&
( commandData.params[vectorParamIndexIt->first].type.type == "void" ) && ( commandData.params[vectorParamIndexIt->first].type.type == "void" ) &&
commandData.params[vectorParamIndexIt->second].type.isValue() ) commandData.params[vectorParamIndexIt->second].type.isValue() )
{ {
// the vector is a non-const pointer to void (that is, a return parameter), and the size is given by value
appendCommandGetVector( str, name, commandData, vectorParamIndices, definition ); appendCommandGetVector( str, name, commandData, vectorParamIndices, definition );
return; return;
} }
@ -1265,6 +1279,7 @@ void VulkanHppGenerator::appendCommand( std::string & str,
break; break;
case 2: case 2:
{ {
// two vector parameters
auto firstVectorParam = vectorParamIndices.begin(); auto firstVectorParam = vectorParamIndices.begin();
auto secondVectorParam = firstVectorParam++; auto secondVectorParam = firstVectorParam++;
std::vector<ParamData> const & params = commandData.params; std::vector<ParamData> const & params = commandData.params;
@ -1273,6 +1288,8 @@ void VulkanHppGenerator::appendCommand( std::string & str,
params[secondVectorParam->first].type.isNonConstPointer() && params[secondVectorParam->first].type.isNonConstPointer() &&
params[firstVectorParam->second].type.isNonConstPointer() ) params[firstVectorParam->second].type.isNonConstPointer() )
{ {
// both vectors are non-const pointer (that is, return parameters), and share the same size parameter, which in
// turn is a non-const pointer
appendCommandEnumerateTwoVectors( str, name, commandData, vectorParamIndices, definition ); appendCommandEnumerateTwoVectors( str, name, commandData, vectorParamIndices, definition );
return; return;
} }
@ -1655,6 +1672,44 @@ ${leave}
} }
} }
void VulkanHppGenerator::appendCommandSimpleVoid( std::string & str,
std::string const & name,
CommandData const & commandData,
bool definition ) const
{
const std::string functionTemplate = R"(
${enter}${commandStandard}${newlineOnDefinition}
#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
${commandEnhanced}
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
${leave}
)";
std::string enter, leave;
std::tie( enter, leave ) = generateProtection( commandData.feature, commandData.extensions );
str += replaceWithMap( functionTemplate,
std::map<std::string, std::string>(
{ { "commandEnhanced", constructCommandSimpleVoid( name, commandData, definition ) },
{ "commandStandard", constructCommandStandardVoid( name, commandData, definition ) },
{ "enter", enter },
{ "leave", leave },
{ "newlineOnDefinition", definition ? "\n" : "" } } ) );
if ( !commandData.aliasData.empty() )
{
CommandData aliasCommandData = commandData;
aliasCommandData.aliasData.clear();
for ( auto const & ad : commandData.aliasData )
{
aliasCommandData.extensions = ad.second.extensions;
aliasCommandData.feature = ad.second.feature;
aliasCommandData.xmlLine = ad.second.xmlLine;
appendCommandSimpleVoid( str, ad.first, aliasCommandData, definition );
}
}
}
void VulkanHppGenerator::appendDispatchLoaderDynamic( std::string & str ) void VulkanHppGenerator::appendDispatchLoaderDynamic( std::string & str )
{ {
str += R"( str += R"(
@ -3618,6 +3673,7 @@ void VulkanHppGenerator::appendStructCompareOperators( std::string &
std::string VulkanHppGenerator::constructArgumentListEnhanced( std::vector<ParamData> const & params, std::string VulkanHppGenerator::constructArgumentListEnhanced( std::vector<ParamData> const & params,
std::set<size_t> const & skippedParams, std::set<size_t> const & skippedParams,
bool definition,
bool withAllocators ) const bool withAllocators ) const
{ {
assert( *skippedParams.begin() == 0 ); assert( *skippedParams.begin() == 0 );
@ -3630,19 +3686,29 @@ std::string VulkanHppGenerator::constructArgumentListEnhanced( std::vector<Param
{ {
if ( params[i].type.isConstPointer() ) if ( params[i].type.isConstPointer() )
{ {
argumentList += "const " + stripPrefix( params[i].type.type, "Vk" ) + " & " + if ( params[i].optional )
startLowerCase( stripPrefix( params[i].name, "p" ) ) + ", "; {
assert( params[i].type.isConstPointer() );
argumentList += "Optional<const " + stripPrefix( params[i].type.type, "Vk" ) + "> " +
startLowerCase( stripPrefix( params[i].name, "p" ) +
( definition ? "" : " VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT" ) );
}
else
{
argumentList += "const " + stripPrefix( params[i].type.type, "Vk" ) + " & " +
startLowerCase( stripPrefix( params[i].name, "p" ) );
}
} }
else else
{ {
argumentList += argumentList += "VULKAN_HPP_NAMESPACE::" + stripPrefix( params[i].type.type, "Vk" ) + " " + params[i].name;
"VULKAN_HPP_NAMESPACE::" + stripPrefix( params[i].type.type, "Vk" ) + " " + params[i].name + ", ";
} }
} }
else else
{ {
argumentList += params[i].type.compose() + " " + params[i].name + ", "; argumentList += params[i].type.compose() + " " + params[i].name;
} }
argumentList += ", ";
} }
} }
if ( withAllocators ) if ( withAllocators )
@ -3656,7 +3722,8 @@ std::string VulkanHppGenerator::constructArgumentListEnhanced( std::vector<Param
} }
} }
} }
argumentList += "Dispatch const & d "; argumentList +=
std::string( "Dispatch const & d " ) + ( definition ? "" : " VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT" );
return argumentList; return argumentList;
} }
@ -3772,6 +3839,7 @@ std::string
std::string argumentList = constructArgumentListEnhanced( std::string argumentList = constructArgumentListEnhanced(
commandData.params, commandData.params,
{ 0, firstVectorParamIt->second, firstVectorParamIt->first, secondVectorParamIt->first }, { 0, firstVectorParamIt->second, firstVectorParamIt->first, secondVectorParamIt->first },
definition,
withAllocators ); withAllocators );
std::string commandName = determineCommandName( name, commandData.params[0].type.type ); std::string commandName = determineCommandName( name, commandData.params[0].type.type );
std::string nodiscard = constructNoDiscardEnhanced( commandData ); std::string nodiscard = constructNoDiscardEnhanced( commandData );
@ -3845,7 +3913,7 @@ std::string
{ {
const std::string functionTemplate = const std::string functionTemplate =
R"( template <typename ${templateTypeFirst}Allocator = std::allocator<${templateTypeFirst}>, typename ${templateTypeSecond}Allocator = std::allocator<${templateTypeSecond}>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE${withAllocatorTypenameCheck}> R"( template <typename ${templateTypeFirst}Allocator = std::allocator<${templateTypeFirst}>, typename ${templateTypeSecond}Allocator = std::allocator<${templateTypeSecond}>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE${withAllocatorTypenameCheck}>
${nodiscard}typename ResultValueType<std::pair<std::vector<${templateTypeFirst}, ${templateTypeFirst}Allocator>, std::vector<${templateTypeSecond}, ${templateTypeSecond}Allocator>>>::type ${commandName}( ${argumentList} VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;)"; ${nodiscard}typename ResultValueType<std::pair<std::vector<${templateTypeFirst}, ${templateTypeFirst}Allocator>, std::vector<${templateTypeSecond}, ${templateTypeSecond}Allocator>>>::type ${commandName}( ${argumentList} ) const;)";
std::string withAllocatorsTypenameCheck = std::string withAllocatorsTypenameCheck =
", typename B1 = " + templateTypeFirst + "Allocator, typename B2 = " + templateTypeSecond + ", typename B1 = " + templateTypeFirst + "Allocator, typename B2 = " + templateTypeSecond +
@ -3876,7 +3944,7 @@ std::string VulkanHppGenerator::constructCommandEnumerateTwoVectorsDeprecated(
size_t returnParamIndex = determineReturnParamIndex( commandData, vectorParamIndices, true ); size_t returnParamIndex = determineReturnParamIndex( commandData, vectorParamIndices, true );
std::string argumentList = constructFunctionHeaderArgumentsEnhanced( std::string argumentList = constructFunctionHeaderArgumentsEnhanced(
commandData, returnParamIndex, returnParamIndex, vectorParamIndices, false, false, withAllocators ); commandData, returnParamIndex, returnParamIndex, vectorParamIndices, false, !definition, withAllocators );
std::string commandName = determineCommandName( name, commandData.params[0].type.type ); std::string commandName = determineCommandName( name, commandData.params[0].type.type );
std::string nodiscard = constructNoDiscardEnhanced( commandData ); std::string nodiscard = constructNoDiscardEnhanced( commandData );
std::string returnType = determineEnhancedReturnType( commandData, returnParamIndex, vectorParamIndices, false ); std::string returnType = determineEnhancedReturnType( commandData, returnParamIndex, vectorParamIndices, false );
@ -3923,7 +3991,7 @@ std::string VulkanHppGenerator::constructCommandEnumerateTwoVectorsDeprecated(
{ {
const std::string functionTemplate = const std::string functionTemplate =
R"( template <typename Allocator = std::allocator<${templateType}>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE${typeCheck}> R"( template <typename Allocator = std::allocator<${templateType}>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE${typeCheck}>
${nodiscard}typename ResultValueType<${returnType}>::type ${commandName}( ${argumentList} VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;)"; ${nodiscard}typename ResultValueType<${returnType}>::type ${commandName}( ${argumentList} ) const;)";
std::string typeCheck = std::string typeCheck =
withAllocators ? ", typename B = Allocator, typename std::enable_if<std::is_same<typename B::value_type, " + withAllocators ? ", typename B = Allocator, typename std::enable_if<std::is_same<typename B::value_type, " +
@ -3952,10 +4020,11 @@ std::string VulkanHppGenerator::constructCommandGetVector( std::string const &
std::string str; std::string str;
size_t vectorParamIndex = vectorParamIndices.begin()->first; size_t vectorParamIndex = vectorParamIndices.begin()->first;
std::string argumentList = constructArgumentListEnhanced( commandData.params, { 0, vectorParamIndex }, false ); std::string argumentList =
std::string commandName = determineCommandName( name, commandData.params[0].type.type ); constructArgumentListEnhanced( commandData.params, { 0, vectorParamIndex }, definition, false );
std::string nodiscard = constructNoDiscardEnhanced( commandData ); std::string commandName = determineCommandName( name, commandData.params[0].type.type );
std::string returnType = constructReturnType( commandData, "std::vector<T,Allocator>" ); std::string nodiscard = constructNoDiscardEnhanced( commandData );
std::string returnType = constructReturnType( commandData, "std::vector<T,Allocator>" );
if ( definition ) if ( definition )
{ {
@ -3987,7 +4056,7 @@ std::string VulkanHppGenerator::constructCommandGetVector( std::string const &
{ {
std::string const functionTemplate = std::string const functionTemplate =
R"( template <typename T, typename Allocator = std::allocator<T>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE> R"( template <typename T, typename Allocator = std::allocator<T>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
${nodiscard}${returnType} ${commandName}( ${argumentList} VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;)"; ${nodiscard}${returnType} ${commandName}( ${argumentList} ) const;)";
str = replaceWithMap( functionTemplate, str = replaceWithMap( functionTemplate,
std::map<std::string, std::string>( { { "argumentList", argumentList }, std::map<std::string, std::string>( { { "argumentList", argumentList },
@ -4009,7 +4078,7 @@ std::string
std::map<size_t, size_t>::const_iterator vectorParamIndexIt = vectorParamIndices.begin(); std::map<size_t, size_t>::const_iterator vectorParamIndexIt = vectorParamIndices.begin();
std::string argumentList = constructFunctionHeaderArgumentsEnhanced( std::string argumentList = constructFunctionHeaderArgumentsEnhanced(
commandData, INVALID_INDEX, vectorParamIndexIt->first, vectorParamIndices, false, false, false ); commandData, INVALID_INDEX, vectorParamIndexIt->first, vectorParamIndices, false, !definition, false );
std::string commandName = determineCommandName( name, commandData.params[0].type.type ); std::string commandName = determineCommandName( name, commandData.params[0].type.type );
std::string nodiscard = constructNoDiscardEnhanced( commandData ); std::string nodiscard = constructNoDiscardEnhanced( commandData );
std::string returnType = constructReturnType( commandData, "void" ); std::string returnType = constructReturnType( commandData, "void" );
@ -4049,7 +4118,7 @@ std::string
{ {
std::string const functionTemplate = std::string const functionTemplate =
R"( template <typename T, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE> R"( template <typename T, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
${nodiscard}${returnType} ${commandName}( ${argumentList} VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;)"; ${nodiscard}${returnType} ${commandName}( ${argumentList} ) const;)";
str = replaceWithMap( functionTemplate, str = replaceWithMap( functionTemplate,
std::map<std::string, std::string>( { { "argumentList", argumentList }, std::map<std::string, std::string>( { { "argumentList", argumentList },
@ -4073,7 +4142,7 @@ std::string VulkanHppGenerator::constructCommandGetVectorSingular( std::string c
size_t vectorParamIndex = vectorParamIndices.begin()->first; size_t vectorParamIndex = vectorParamIndices.begin()->first;
size_t sizeParamIndex = vectorParamIndices.begin()->second; size_t sizeParamIndex = vectorParamIndices.begin()->second;
std::string argumentList = std::string argumentList =
constructArgumentListEnhanced( commandData.params, { 0, sizeParamIndex, vectorParamIndex }, false ); constructArgumentListEnhanced( commandData.params, { 0, sizeParamIndex, vectorParamIndex }, definition, false );
std::string commandName = stripPluralS( determineCommandName( name, commandData.params[0].type.type ) ); std::string commandName = stripPluralS( determineCommandName( name, commandData.params[0].type.type ) );
std::string nodiscard = constructNoDiscardEnhanced( commandData ); std::string nodiscard = constructNoDiscardEnhanced( commandData );
std::string returnType = constructReturnType( commandData, "T" ); std::string returnType = constructReturnType( commandData, "T" );
@ -4106,7 +4175,7 @@ std::string VulkanHppGenerator::constructCommandGetVectorSingular( std::string c
{ {
std::string const functionTemplate = std::string const functionTemplate =
R"( template <typename T, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE> R"( template <typename T, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
${nodiscard}${returnType} ${commandName}( ${argumentList} VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;)"; ${nodiscard}${returnType} ${commandName}( ${argumentList} ) const;)";
str = replaceWithMap( functionTemplate, str = replaceWithMap( functionTemplate,
std::map<std::string, std::string>( { { "argumentList", argumentList }, std::map<std::string, std::string>( { { "argumentList", argumentList },
@ -4124,7 +4193,7 @@ std::string VulkanHppGenerator::constructCommandSimple( std::string const & name
{ {
std::string str; std::string str;
std::string argumentList = constructArgumentListEnhanced( commandData.params, { 0 }, false ); std::string argumentList = constructArgumentListEnhanced( commandData.params, { 0 }, definition, false );
std::string commandName = determineCommandName( name, commandData.params[0].type.type ); std::string commandName = determineCommandName( name, commandData.params[0].type.type );
std::string nodiscard = constructNoDiscardEnhanced( commandData ); std::string nodiscard = constructNoDiscardEnhanced( commandData );
std::string returnType = constructReturnType( commandData, "void" ); std::string returnType = constructReturnType( commandData, "void" );
@ -4142,7 +4211,7 @@ std::string VulkanHppGenerator::constructCommandSimple( std::string const & name
str = replaceWithMap( functionTemplate, str = replaceWithMap( functionTemplate,
std::map<std::string, std::string>( std::map<std::string, std::string>(
{ { "argumentList", argumentList }, { { "argumentList", argumentList },
{ "callArguments", constructCallArguments( commandData.params, {}, true, true, false ) }, { "callArguments", constructCallArguments( commandData.params, {}, false, true, false ) },
{ "className", stripPrefix( commandData.handle, "Vk" ) }, { "className", stripPrefix( commandData.handle, "Vk" ) },
{ "commandName", commandName }, { "commandName", commandName },
{ "nodiscard", nodiscard }, { "nodiscard", nodiscard },
@ -4153,7 +4222,7 @@ std::string VulkanHppGenerator::constructCommandSimple( std::string const & name
{ {
std::string const functionTemplate = std::string const functionTemplate =
R"( template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE> R"( template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
${nodiscard}${returnType} ${commandName}( ${argumentList} VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;)"; ${nodiscard}${returnType} ${commandName}( ${argumentList} ) const;)";
str = replaceWithMap( functionTemplate, str = replaceWithMap( functionTemplate,
std::map<std::string, std::string>( { { "argumentList", argumentList }, std::map<std::string, std::string>( { { "argumentList", argumentList },
@ -4165,6 +4234,46 @@ std::string VulkanHppGenerator::constructCommandSimple( std::string const & name
return str; return str;
} }
std::string VulkanHppGenerator::constructCommandSimpleVoid( std::string const & name,
CommandData const & commandData,
bool definition ) const
{
std::string str;
std::string argumentList = constructArgumentListEnhanced( commandData.params, { 0 }, definition, false );
std::string commandName = determineCommandName( name, commandData.params[0].type.type );
if ( definition )
{
std::string const functionTemplate =
R"( template <typename Dispatch>
VULKAN_HPP_INLINE void ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT
{
d.${vkCommand}( ${callArguments} );
})";
str = replaceWithMap( functionTemplate,
std::map<std::string, std::string>(
{ { "argumentList", argumentList },
{ "callArguments", constructCallArguments( commandData.params, {}, false, true, false ) },
{ "className", stripPrefix( commandData.handle, "Vk" ) },
{ "commandName", commandName },
{ "vkCommand", name } } ) );
}
else
{
std::string const functionTemplate =
R"( template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
void ${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT;)";
str = replaceWithMap(
functionTemplate,
std::map<std::string, std::string>( { { "argumentList", argumentList }, { "commandName", commandName } } ) );
}
return str;
}
std::string VulkanHppGenerator::constructCommandStandard( std::string const & name, std::string VulkanHppGenerator::constructCommandStandard( std::string const & name,
CommandData const & commandData, CommandData const & commandData,
bool definition ) const bool definition ) const
@ -4208,6 +4317,46 @@ std::string VulkanHppGenerator::constructCommandStandard( std::string const & na
return str; return str;
} }
std::string VulkanHppGenerator::constructCommandStandardVoid( std::string const & name,
CommandData const & commandData,
bool definition ) const
{
std::string str;
std::string argumentList = constructArgumentListStandard( commandData.params, { 0 } );
std::string commandName = determineCommandName( name, commandData.params[0].type.type );
if ( definition )
{
std::string const functionTemplate =
R"( template <typename Dispatch>
VULKAN_HPP_INLINE void ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT
{
d.${vkCommand}( ${callArguments} );
})";
str = replaceWithMap( functionTemplate,
std::map<std::string, std::string>( {
{ "argumentList", argumentList },
{ "callArguments", constructCallArguments( commandData.params, {}, false, false, false ) },
{ "className", stripPrefix( commandData.handle, "Vk" ) },
{ "commandName", commandName },
{ "vkCommand", name },
} ) );
}
else
{
std::string const functionTemplate =
R"( template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
void ${commandName}( ${argumentList} VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;)";
str = replaceWithMap(
functionTemplate,
std::map<std::string, std::string>( { { "argumentList", argumentList }, { "commandName", commandName } } ) );
}
return str;
}
std::string std::string
VulkanHppGenerator::constructConstexprString( std::pair<std::string, StructureData> const & structData ) const VulkanHppGenerator::constructConstexprString( std::pair<std::string, StructureData> const & structData ) const
{ {
@ -4413,7 +4562,7 @@ std::string
str += "Allocator const& vectorAllocator, "; str += "Allocator const& vectorAllocator, ";
} }
str += "Dispatch const &d"; str += "Dispatch const &d";
if ( withDefaults && !withAllocator ) if ( withDefaults )
{ {
str += " VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT"; str += " VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT";
} }

9
VulkanHppGenerator.hpp
View File

@ -330,6 +330,10 @@ private:
std::string const & name, std::string const & name,
CommandData const & commandData, CommandData const & commandData,
bool definition ) const; bool definition ) const;
void appendCommandSimpleVoid( std::string & str,
std::string const & name,
CommandData const & commandData,
bool definition ) const;
void appendDispatchLoaderDynamicCommand( std::string & str, void appendDispatchLoaderDynamicCommand( std::string & str,
std::string & emptyFunctions, std::string & emptyFunctions,
std::string & deviceFunctions, std::string & deviceFunctions,
@ -511,6 +515,7 @@ private:
std::set<std::string> const & childrenTypes ) const; std::set<std::string> const & childrenTypes ) const;
std::string constructArgumentListEnhanced( std::vector<ParamData> const & params, std::string constructArgumentListEnhanced( std::vector<ParamData> const & params,
std::set<size_t> const & skippedParams, std::set<size_t> const & skippedParams,
bool definition,
bool withAllocators ) const; bool withAllocators ) const;
std::string constructArgumentListStandard( std::vector<ParamData> const & params, std::string constructArgumentListStandard( std::vector<ParamData> const & params,
std::set<size_t> const & skippedParams ) const; std::set<size_t> const & skippedParams ) const;
@ -543,8 +548,12 @@ private:
bool definition ) const; bool definition ) const;
std::string std::string
constructCommandSimple( std::string const & name, CommandData const & commandData, bool definition ) const; constructCommandSimple( std::string const & name, CommandData const & commandData, bool definition ) const;
std::string
constructCommandSimpleVoid( std::string const & name, CommandData const & commandData, bool definition ) const;
std::string std::string
constructCommandStandard( std::string const & name, CommandData const & commandData, bool definition ) const; constructCommandStandard( std::string const & name, CommandData const & commandData, bool definition ) const;
std::string
constructCommandStandardVoid( std::string const & name, CommandData const & commandData, bool definition ) const;
std::string constructConstexprString( std::pair<std::string, StructureData> const & structData ) const; std::string constructConstexprString( std::pair<std::string, StructureData> const & structData ) const;
std::string constructFunctionBodyEnhanced( std::string const & indentation, std::string constructFunctionBodyEnhanced( std::string const & indentation,
std::string const & name, std::string const & name,

660
vulkan/vulkan.hpp
View File

File diff suppressed because it is too large Load Diff