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

Browse Source 
Refactor command that returns a vector of data and potentially gets vector(s) of data as input.
This commit is contained in:
Andreas Süßenbach 2020-10-21 22:47:14 +02:00 committed by GitHub
commit 9d8acb901b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 113 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
VulkanHppGenerator.cpp
View File

@ -631,7 +631,14 @@ std::string stripPluralS( std::string const & name )
size_t pos = strippedName.rfind( 's' ); size_t pos = strippedName.rfind( 's' );
if ( pos != std::string::npos ) if ( pos != std::string::npos )
{ {
strippedName.erase( pos, 1 ); if ( ( 2 <= pos ) && ( strippedName.substr( pos - 2, 3 ) == "ies" ) )
{
strippedName.replace( pos - 2, 3, "y" );
}
else
{
strippedName.erase( pos, 1 );
}
} }
return strippedName; return strippedName;
} }
@ -1229,13 +1236,12 @@ void VulkanHppGenerator::appendCommand( std::string & str,
appendedFunction = true; appendedFunction = true;
} }
} }
else if ( ( vectorParamIndices.size() == 1 ) && else if ( ( commandData.params[returnVectorParamIt->first].type.type == "void" ) &&
( commandData.params[returnVectorParamIt->first].type.type == "void" ) &&
( commandData.params[returnVectorParamIt->second].type.isValue() ) ) ( commandData.params[returnVectorParamIt->second].type.isValue() ) )
{ {
// provide standard, enhanced, and singular calls // provide standard, enhanced, and singular calls
appendCommandSingular( appendCommandSingular(
str, name, commandData, vectorParamIndices, nonConstPointerParamIndices[0], definition ); str, name, commandData, definition, vectorParamIndices, nonConstPointerParamIndices[0] );
appendedFunction = true; appendedFunction = true;
} }
} }
@ -1262,7 +1268,7 @@ void VulkanHppGenerator::appendCommand( std::string & str,
if ( ( commandData.returnType == "VkResult" ) || ( commandData.returnType == "void" ) ) if ( ( commandData.returnType == "VkResult" ) || ( commandData.returnType == "void" ) )
{ {
// provide standard, enhanced, and vector calls // provide standard, enhanced, and vector calls
appendCommandVector( str, name, commandData, *vectorParamIndexIt, definition ); appendCommandVector( str, name, commandData, definition, *vectorParamIndexIt );
appendedFunction = true; appendedFunction = true;
} }
} }
@ -1516,9 +1522,9 @@ ${leave})";
void VulkanHppGenerator::appendCommandSingular( std::string & str, void VulkanHppGenerator::appendCommandSingular( std::string & str,
std::string const & name, std::string const & name,
CommandData const & commandData, CommandData const & commandData,
bool definition,
std::map<size_t, size_t> const & vectorParamIndices, std::map<size_t, size_t> const & vectorParamIndices,
size_t returnParamIndex, size_t returnParamIndex ) const
bool definition ) const
{ {
assert( commandData.returnType == "VkResult" ); assert( commandData.returnType == "VkResult" );
@ -1738,8 +1744,8 @@ ${leave})";
void VulkanHppGenerator::appendCommandVector( std::string & str, void VulkanHppGenerator::appendCommandVector( std::string & str,
std::string const & name, std::string const & name,
CommandData const & commandData, CommandData const & commandData,
std::pair<size_t, size_t> const & vectorParamIndex, bool definition,
bool definition ) const std::pair<size_t, size_t> const & vectorParamIndex ) const
{ {
assert( ( commandData.returnType == "VkResult" ) || ( commandData.returnType == "void" ) ); assert( ( commandData.returnType == "VkResult" ) || ( commandData.returnType == "void" ) );
@ -3878,6 +3884,10 @@ std::string VulkanHppGenerator::constructCallArgumentsGetVector( std::string con
else if ( params[lenIt->second].type.isValue() ) else if ( params[lenIt->second].type.isValue() )
{ {
arguments += startLowerCase( stripPrefix( params[lenIt->first].name, "p" ) ) + ".size()"; arguments += startLowerCase( stripPrefix( params[lenIt->first].name, "p" ) ) + ".size()";
if ( params[lenIt->first].type.type == "void" )
{
arguments += " * sizeof( T )";
}
} }
else else
{ {
@ -4047,7 +4057,7 @@ std::string VulkanHppGenerator::constructCommandResultEnumerate( std::string con
std::set<size_t> skippedParams = determineSkippedParams( commandData.handle, std::set<size_t> skippedParams = determineSkippedParams( commandData.handle,
commandData.params, commandData.params,
{ vectorParamIndices }, { vectorParamIndices },
{ vectorParamIndices.second, vectorParamIndices.first } ); { vectorParamIndices.second, vectorParamIndices.first }, false );
std::string argumentList = std::string argumentList =
constructArgumentListEnhanced( commandData.params, skippedParams, INVALID_INDEX, definition, withAllocator ); constructArgumentListEnhanced( commandData.params, skippedParams, INVALID_INDEX, definition, withAllocator );
@ -4712,8 +4722,11 @@ std::string VulkanHppGenerator::constructCommandResultGetVector( std::string con
std::string str; std::string str;
std::set<size_t> skippedParams =
determineSkippedParams( commandData.handle, commandData.params, vectorParamIndices, { returnParamIndex }, false );
std::string argumentList = std::string argumentList =
constructArgumentListEnhanced( commandData.params, { 0, returnParamIndex }, INVALID_INDEX, definition, false ); constructArgumentListEnhanced( commandData.params, skippedParams, INVALID_INDEX, 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, "std::vector<T,Allocator>" ); std::string returnType = constructReturnType( commandData, "std::vector<T,Allocator>" );
@ -4931,7 +4944,7 @@ std::string
std::string str; std::string str;
std::set<size_t> skippedParams = std::set<size_t> skippedParams =
determineSkippedParams( commandData.handle, commandData.params, vectorParamIndices, { returnParamIndex } ); determineSkippedParams( commandData.handle, commandData.params, vectorParamIndices, { returnParamIndex }, false );
std::string argumentList = std::string argumentList =
constructArgumentListEnhanced( commandData.params, skippedParams, INVALID_INDEX, definition, withAllocator ); constructArgumentListEnhanced( commandData.params, skippedParams, INVALID_INDEX, definition, withAllocator );
@ -5015,7 +5028,7 @@ std::string VulkanHppGenerator::constructCommandResultGetVectorOfHandlesSingular
std::string str; std::string str;
std::set<size_t> skippedParams = std::set<size_t> skippedParams =
determineSkippedParams( commandData.handle, commandData.params, vectorParamIndices, { returnParamIndex } ); determineSkippedParams( commandData.handle, commandData.params, vectorParamIndices, { returnParamIndex }, true );
size_t singularParam = ( returnParamIndex == vectorParamIndices.begin()->first ) size_t singularParam = ( returnParamIndex == vectorParamIndices.begin()->first )
? std::next( vectorParamIndices.begin() )->first ? std::next( vectorParamIndices.begin() )->first
: vectorParamIndices.begin()->first; : vectorParamIndices.begin()->first;
@ -5086,7 +5099,7 @@ std::string VulkanHppGenerator::constructCommandResultGetVectorOfHandlesUnique(
std::string str; std::string str;
std::set<size_t> skippedParams = std::set<size_t> skippedParams =
determineSkippedParams( commandData.handle, commandData.params, vectorParamIndices, { returnParamIndex } ); determineSkippedParams( commandData.handle, commandData.params, vectorParamIndices, { returnParamIndex }, false );
std::string argumentList = std::string argumentList =
constructArgumentListEnhanced( commandData.params, skippedParams, INVALID_INDEX, definition, withAllocator ); constructArgumentListEnhanced( commandData.params, skippedParams, INVALID_INDEX, definition, withAllocator );
@ -5210,7 +5223,7 @@ std::string VulkanHppGenerator::constructCommandResultGetVectorOfHandlesUniqueSi
std::string str; std::string str;
std::set<size_t> skippedParams = std::set<size_t> skippedParams =
determineSkippedParams( commandData.handle, commandData.params, vectorParamIndices, { returnParamIndex } ); determineSkippedParams( commandData.handle, commandData.params, vectorParamIndices, { returnParamIndex }, true );
size_t singularParam = ( returnParamIndex == vectorParamIndices.begin()->first ) size_t singularParam = ( returnParamIndex == vectorParamIndices.begin()->first )
? std::next( vectorParamIndices.begin() )->first ? std::next( vectorParamIndices.begin() )->first
: vectorParamIndices.begin()->first; : vectorParamIndices.begin()->first;
@ -5282,12 +5295,11 @@ std::string
std::string str; std::string str;
std::string argumentList = constructArgumentListEnhanced( std::set<size_t> skippedParams =
commandData.params, determineSkippedParams( commandData.handle, commandData.params, vectorParamIndices, { returnParamIndex }, true );
determineSkippedParams( commandData.handle, commandData.params, vectorParamIndices, { returnParamIndex } ),
INVALID_INDEX, std::string argumentList =
definition, constructArgumentListEnhanced( commandData.params, skippedParams, INVALID_INDEX, definition, false );
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" );
@ -7312,7 +7324,7 @@ size_t VulkanHppGenerator::determineReturnParamIndex( CommandData const &
std::set<size_t> VulkanHppGenerator::determineSkippedParams( std::string const & handleType, std::set<size_t> VulkanHppGenerator::determineSkippedParams( std::string const & handleType,
std::vector<ParamData> const & params, std::vector<ParamData> const & params,
std::map<size_t, size_t> const & vectorParamIndices, std::map<size_t, size_t> const & vectorParamIndices,
std::vector<size_t> const & returnParamIndices ) const std::vector<size_t> const & returnParamIndices, bool singular ) const
{ {
std::set<size_t> skippedParams = { returnParamIndices.begin(), returnParamIndices.end() }; std::set<size_t> skippedParams = { returnParamIndices.begin(), returnParamIndices.end() };
@ -7326,7 +7338,7 @@ std::set<size_t> VulkanHppGenerator::determineSkippedParams( std::string const &
if ( ( std::find_if( returnParamIndices.begin(), if ( ( std::find_if( returnParamIndices.begin(),
returnParamIndices.end(), returnParamIndices.end(),
[&vpi]( size_t rpi ) { return vpi.first == rpi; } ) == returnParamIndices.end() ) || [&vpi]( size_t rpi ) { return vpi.first == rpi; } ) == returnParamIndices.end() ) ||
params[vpi.second].type.isValue() ) ( singular && params[vpi.second].type.isValue() ) )
{ {
skippedParams.insert( vpi.second ); skippedParams.insert( vpi.second );
} }

17
VulkanHppGenerator.hpp
View File

@ -320,9 +320,9 @@ private:
void appendCommandSingular( std::string & str, void appendCommandSingular( std::string & str,
std::string const & name, std::string const & name,
CommandData const & commandData, CommandData const & commandData,
bool definition,
std::map<size_t, size_t> const & vectorParamIndices, std::map<size_t, size_t> const & vectorParamIndices,
size_t returnParamIndex, size_t returnParamIndex ) const;
bool definition ) const;
void appendCommandStandard( std::string & str, void appendCommandStandard( std::string & str,
std::string const & name, std::string const & name,
CommandData const & commandData, CommandData const & commandData,
@ -352,8 +352,8 @@ private:
void appendCommandVector( std::string & str, void appendCommandVector( std::string & str,
std::string const & name, std::string const & name,
CommandData const & commandData, CommandData const & commandData,
std::pair<size_t, size_t> const & vectorParamIndex, bool definition,
bool definition ) const; std::pair<size_t, size_t> const & vectorParamIndex ) const;
void appendCommandVectorDeprecated( std::string & str, void appendCommandVectorDeprecated( std::string & str,
std::string const & name, std::string const & name,
CommandData const & commandData, CommandData const & commandData,
@ -679,16 +679,17 @@ private:
bool containsUnion( std::string const & type ) const; bool containsUnion( std::string const & type ) const;
size_t determineDefaultStartIndex( std::vector<ParamData> const & params, size_t determineDefaultStartIndex( std::vector<ParamData> const & params,
std::set<size_t> const & skippedParams ) const; std::set<size_t> const & skippedParams ) const;
std::string determineEnhancedReturnType( CommandData const & commandData, std::string determineEnhancedReturnType( CommandData const & commandData,
size_t returnParamIndex, size_t returnParamIndex,
bool isStructureChain ) const; bool isStructureChain ) const;
size_t determineReturnParamIndex( CommandData const & commandData, size_t determineReturnParamIndex( CommandData const & commandData,
std::map<size_t, size_t> const & vectorParamIndices, std::map<size_t, size_t> const & vectorParamIndices,
bool twoStep ) const; bool twoStep ) const;
std::set<size_t> determineSkippedParams( std::string const & handleType, std::set<size_t> determineSkippedParams( std::string const & handleType,
std::vector<ParamData> const & params, std::vector<ParamData> const & params,
std::map<size_t, size_t> const & vectorParamIndices, std::map<size_t, size_t> const & vectorParamIndices,
std::vector<size_t> const & returnParamIndex ) const; std::vector<size_t> const & returnParamIndex,
bool singular ) const;
std::string determineSubStruct( std::pair<std::string, StructureData> const & structure ) const; std::string determineSubStruct( std::pair<std::string, StructureData> const & structure ) const;
size_t determineTemplateParamIndex( std::vector<ParamData> const & params, size_t determineTemplateParamIndex( std::vector<ParamData> const & params,
std::map<size_t, size_t> const & vectorParamIndices ) const; std::map<size_t, size_t> const & vectorParamIndices ) const;

76
vulkan/vulkan.hpp
View File

@ -55995,6 +55995,22 @@ namespace VULKAN_HPP_NAMESPACE
ArrayProxy<T> const & data, ArrayProxy<T> const & data,
size_t stride, size_t stride,
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const; Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
template <typename T,
typename Allocator = std::allocator<T>,
typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<std::vector<T, Allocator>>::type
writeAccelerationStructuresPropertiesKHR(
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
VULKAN_HPP_NAMESPACE::QueryType queryType,
size_t dataSize,
size_t stride,
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
template <typename T, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<T>::type writeAccelerationStructuresPropertyKHR(
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
VULKAN_HPP_NAMESPACE::QueryType queryType,
size_t stride,
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
# endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ # endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#endif /*VK_ENABLE_BETA_EXTENSIONS*/ #endif /*VK_ENABLE_BETA_EXTENSIONS*/
@ -98139,7 +98155,7 @@ namespace VULKAN_HPP_NAMESPACE
Result result = static_cast<Result>( Result result = static_cast<Result>(
d.vkGetAccelerationStructureHandleNV( m_device, d.vkGetAccelerationStructureHandleNV( m_device,
static_cast<VkAccelerationStructureKHR>( accelerationStructure ), static_cast<VkAccelerationStructureKHR>( accelerationStructure ),
data.size(), data.size() * sizeof( T ),
reinterpret_cast<void *>( data.data() ) ) ); reinterpret_cast<void *>( data.data() ) ) );
return createResultValue( result, data, VULKAN_HPP_NAMESPACE_STRING "::Device::getAccelerationStructureHandleNV" ); return createResultValue( result, data, VULKAN_HPP_NAMESPACE_STRING "::Device::getAccelerationStructureHandleNV" );
} }
@ -100245,7 +100261,7 @@ namespace VULKAN_HPP_NAMESPACE
static_cast<VkQueryPool>( queryPool ), static_cast<VkQueryPool>( queryPool ),
firstQuery, firstQuery,
queryCount, queryCount,
data.size(), data.size() * sizeof( T ),
reinterpret_cast<void *>( data.data() ), reinterpret_cast<void *>( data.data() ),
static_cast<VkDeviceSize>( stride ), static_cast<VkDeviceSize>( stride ),
static_cast<VkQueryResultFlags>( flags ) ) ); static_cast<VkQueryResultFlags>( flags ) ) );
@ -100331,7 +100347,7 @@ namespace VULKAN_HPP_NAMESPACE
static_cast<VkPipeline>( pipeline ), static_cast<VkPipeline>( pipeline ),
firstGroup, firstGroup,
groupCount, groupCount,
data.size(), data.size() * sizeof( T ),
reinterpret_cast<void *>( data.data() ) ) ); reinterpret_cast<void *>( data.data() ) ) );
return createResultValue( return createResultValue(
result, data, VULKAN_HPP_NAMESPACE_STRING "::Device::getRayTracingCaptureReplayShaderGroupHandlesKHR" ); result, data, VULKAN_HPP_NAMESPACE_STRING "::Device::getRayTracingCaptureReplayShaderGroupHandlesKHR" );
@ -100408,7 +100424,7 @@ namespace VULKAN_HPP_NAMESPACE
static_cast<VkPipeline>( pipeline ), static_cast<VkPipeline>( pipeline ),
firstGroup, firstGroup,
groupCount, groupCount,
data.size(), data.size() * sizeof( T ),
reinterpret_cast<void *>( data.data() ) ) ); reinterpret_cast<void *>( data.data() ) ) );
return createResultValue( return createResultValue(
result, data, VULKAN_HPP_NAMESPACE_STRING "::Device::getRayTracingShaderGroupHandlesKHR" ); result, data, VULKAN_HPP_NAMESPACE_STRING "::Device::getRayTracingShaderGroupHandlesKHR" );
@ -100482,7 +100498,7 @@ namespace VULKAN_HPP_NAMESPACE
static_cast<VkPipeline>( pipeline ), static_cast<VkPipeline>( pipeline ),
firstGroup, firstGroup,
groupCount, groupCount,
data.size(), data.size() * sizeof( T ),
reinterpret_cast<void *>( data.data() ) ) ); reinterpret_cast<void *>( data.data() ) ) );
return createResultValue( result, data, VULKAN_HPP_NAMESPACE_STRING "::Device::getRayTracingShaderGroupHandlesNV" ); return createResultValue( result, data, VULKAN_HPP_NAMESPACE_STRING "::Device::getRayTracingShaderGroupHandlesNV" );
} }
@ -101800,10 +101816,12 @@ namespace VULKAN_HPP_NAMESPACE
pData, pData,
stride ) ); stride ) );
} }
# ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE # ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
template <typename T, typename Dispatch> template <typename T, typename Dispatch>
VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type VULKAN_HPP_DEPRECATED( "This function is deprecated. Use one of the other flavours of it." )
Device::writeAccelerationStructuresPropertiesKHR( VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE
typename ResultValueType<void>::type Device::writeAccelerationStructuresPropertiesKHR(
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures, ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
VULKAN_HPP_NAMESPACE::QueryType queryType, VULKAN_HPP_NAMESPACE::QueryType queryType,
ArrayProxy<T> const & data, ArrayProxy<T> const & data,
@ -101821,6 +101839,50 @@ namespace VULKAN_HPP_NAMESPACE
return createResultValue( result, return createResultValue( result,
VULKAN_HPP_NAMESPACE_STRING "::Device::writeAccelerationStructuresPropertiesKHR" ); VULKAN_HPP_NAMESPACE_STRING "::Device::writeAccelerationStructuresPropertiesKHR" );
} }
template <typename T, typename Allocator, typename Dispatch>
VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<std::vector<T, Allocator>>::type
Device::writeAccelerationStructuresPropertiesKHR(
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
VULKAN_HPP_NAMESPACE::QueryType queryType,
size_t dataSize,
size_t stride,
Dispatch const & d ) const
{
VULKAN_HPP_ASSERT( dataSize % sizeof( T ) == 0 );
std::vector<T, Allocator> data( dataSize / sizeof( T ) );
Result result = static_cast<Result>( d.vkWriteAccelerationStructuresPropertiesKHR(
m_device,
accelerationStructures.size(),
reinterpret_cast<const VkAccelerationStructureKHR *>( accelerationStructures.data() ),
static_cast<VkQueryType>( queryType ),
data.size() * sizeof( T ),
reinterpret_cast<void *>( data.data() ),
stride ) );
return createResultValue(
result, data, VULKAN_HPP_NAMESPACE_STRING "::Device::writeAccelerationStructuresPropertiesKHR" );
}
template <typename T, typename Dispatch>
VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<T>::type
Device::writeAccelerationStructuresPropertyKHR(
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
VULKAN_HPP_NAMESPACE::QueryType queryType,
size_t stride,
Dispatch const & d ) const
{
T data;
Result result = static_cast<Result>( d.vkWriteAccelerationStructuresPropertiesKHR(
m_device,
1,
reinterpret_cast<const VkAccelerationStructureKHR *>( &accelerationStructure ),
static_cast<VkQueryType>( queryType ),
sizeof( T ),
reinterpret_cast<void *>( &data ),
stride ) );
return createResultValue(
result, data, VULKAN_HPP_NAMESPACE_STRING "::Device::writeAccelerationStructuresPropertyKHR" );
}
# endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ # endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#endif /*VK_ENABLE_BETA_EXTENSIONS*/ #endif /*VK_ENABLE_BETA_EXTENSIONS*/