mewin/vulkan-hpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve handling of attribute "stride" (#1532)

Browse Source
This commit is contained in:
Andreas Süßenbach 2023-03-13 14:48:55 +01:00 committed by GitHub
parent 2acce33951
commit fa079aefaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
VulkanHppGenerator.cpp
View File

@ -1706,9 +1706,10 @@ std::map<size_t, VulkanHppGenerator::VectorParamData> VulkanHppGenerator::determ
if ( params[i].lenParams.empty() ) if ( params[i].lenParams.empty() )
{ {
std::string len = params[i].lenExpression; std::string const & lenExpression = params[i].lenExpression;
assert( std::find_if( params.begin(), params.end(), [&len]( auto const & pd ) { return ( len == pd.name ); } ) == params.end() ); assert( std::find_if( params.begin(), params.end(), [&lenExpression]( auto const & pd ) { return ( lenExpression == pd.name ); } ) == params.end() );
auto lenIt = std::find_if( params.begin(), params.end(), [this, &len]( auto const & pd ) { return isLenByStructMember( len, pd ); } ); auto lenIt =
std::find_if( params.begin(), params.end(), [this, &lenExpression]( auto const & pd ) { return isLenByStructMember( lenExpression, pd ); } );
assert( lenIt != params.end() ); assert( lenIt != params.end() );
vpd.lenParam = std::distance( params.begin(), lenIt ); vpd.lenParam = std::distance( params.begin(), lenIt );
} }
@ -1717,12 +1718,9 @@ std::map<size_t, VulkanHppGenerator::VectorParamData> VulkanHppGenerator::determ
assert( params[i].lenParams.size() == 1 ); assert( params[i].lenParams.size() == 1 );
vpd.lenParam = params[i].lenParams[0].second; vpd.lenParam = params[i].lenParams[0].second;
} }
if ( !params[i].stride.empty() ) if ( !params[i].strideParam.first.empty() )
{ {
std::string const & stride = params[i].stride; vpd.strideParam = params[i].strideParam.second;
auto strideIt = std::find_if( params.begin(), params.end(), [&stride]( auto const & pd ) { return stride == pd.name; } );
assert( strideIt != params.end() );
vpd.strideParam = std::distance( params.begin(), strideIt );
} }
} }
} }
@ -2004,10 +2002,10 @@ std::string VulkanHppGenerator::generateArgumentListEnhanced( std::vector<ParamD
type.replace( pos, 4, stripPrefix( params[i].name, "p" ) + "Type" ); type.replace( pos, 4, stripPrefix( params[i].name, "p" ) + "Type" );
} }
argumentList += argumentList +=
std::string( "VULKAN_HPP_NAMESPACE::" ) + ( params[i].stride.empty() ? "" : "Strided" ) + "ArrayProxy<" + type + "> const & " + name; std::string( "VULKAN_HPP_NAMESPACE::" ) + ( params[i].strideParam.first.empty() ? "" : "Strided" ) + "ArrayProxy<" + type + "> const & " + name;
if ( params[i].optional && !definition ) if ( params[i].optional && !definition )
{ {
assert( params[i].stride.empty() ); assert( params[i].strideParam.first.empty() );
argumentList += " VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT"; argumentList += " VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT";
hasDefaultAssignment = true; hasDefaultAssignment = true;
} }
@ -2618,6 +2616,7 @@ std::string VulkanHppGenerator::generateCallArgumentEnhancedValue( std::vector<P
{ {
if ( param.arraySizes.empty() ) if ( param.arraySizes.empty() )
{ {
// check if this param is used as the len of an other param
auto pointerIt = std::find_if( params.begin(), params.end(), [&param]( ParamData const & pd ) { return pd.lenExpression == param.name; } ); auto pointerIt = std::find_if( params.begin(), params.end(), [&param]( ParamData const & pd ) { return pd.lenExpression == param.name; } );
if ( pointerIt != params.end() ) if ( pointerIt != params.end() )
{ {
@ -2632,7 +2631,9 @@ std::string VulkanHppGenerator::generateCallArgumentEnhancedValue( std::vector<P
{ {
argument = "static_cast<" + param.type.compose( "" ) + ">( " + param.name + " )"; argument = "static_cast<" + param.type.compose( "" ) + ">( " + param.name + " )";
} }
assert( std::find_if( params.begin(), params.end(), [&param]( ParamData const & pd ) { return pd.stride == param.name; } ) == params.end() ); // check if this param is used as the stride of an other param
assert( std::find_if( params.begin(), params.end(), [paramIndex]( ParamData const & pd ) { return pd.strideParam.second == paramIndex; } ) ==
params.end() );
} }
else else
{ {
@ -2674,12 +2675,13 @@ std::string VulkanHppGenerator::generateCallArgumentEnhancedValue( std::vector<P
{ {
assert( !param.optional ); assert( !param.optional );
assert( param.arraySizes.size() <= 1 ); assert( param.arraySizes.size() <= 1 );
pointerIt = std::find_if( params.begin(), params.end(), [&param]( ParamData const & pd ) { return pd.stride == param.name; } ); pointerIt = std::find_if( params.begin(), params.end(), [paramIndex]( ParamData const & pd ) { return pd.strideParam.second == paramIndex; } );
if ( pointerIt != params.end() ) if ( pointerIt != params.end() )
{ {
// this parameter is the stride of some other -> replace it with that parameter's stride // this parameter is the stride of some other -> replace it with that parameter's stride
assert( param.arraySizes.empty() ); assert( param.arraySizes.empty() );
assert( param.type.type == "uint32_t" ); assert( param.type.type == "uint32_t" );
assert( pointerIt->strideParam.first == param.name );
argument = startLowerCase( stripPrefix( pointerIt->name, "p" ) ) + ".stride()"; argument = startLowerCase( stripPrefix( pointerIt->name, "p" ) ) + ".stride()";
} }
else else
@ -10978,6 +10980,13 @@ void VulkanHppGenerator::readCommand( tinyxml2::XMLElement const * element )
">" ); ">" );
lenParam.second = std::distance( commandData.params.cbegin(), paramIt ); lenParam.second = std::distance( commandData.params.cbegin(), paramIt );
} }
if ( !param.strideParam.first.empty() )
{
auto paramIt = findParamIt( param.strideParam.first, commandData.params );
checkForError(
paramIt != commandData.params.end(), param.xmlLine, "param <" + param.name + "> uses unknown stride parameter <" + param.strideParam.first + ">" );
param.strideParam.second = std::distance( commandData.params.cbegin(), paramIt );
}
} }
assert( !name.empty() ); assert( !name.empty() );
@ -10987,12 +10996,6 @@ void VulkanHppGenerator::readCommand( tinyxml2::XMLElement const * element )
checkForError( ( commandData.returnType == "VkResult" ) || commandData.successCodes.empty(), checkForError( ( commandData.returnType == "VkResult" ) || commandData.successCodes.empty(),
line, line,
"command <" + name + "> does not return a VkResult but specifies successcodes" ); "command <" + name + "> does not return a VkResult but specifies successcodes" );
for ( auto const & param : commandData.params )
{
checkForError( param.stride.empty() || isParam( param.stride, commandData.params ),
param.xmlLine,
"attribute <stride> holds an unknown value <" + param.stride + ">" );
}
if ( api.empty() || ( api == m_api ) ) if ( api.empty() || ( api == m_api ) )
{ {
@ -11054,7 +11057,7 @@ std::pair<bool, VulkanHppGenerator::ParamData> VulkanHppGenerator::readCommandPa
} }
else if ( attribute.first == "stride" ) else if ( attribute.first == "stride" )
{ {
paramData.stride = attribute.second; paramData.strideParam.first = attribute.second;
} }
else if ( attribute.first == "optional" ) else if ( attribute.first == "optional" )
{ {

2
VulkanHppGenerator.hpp
View File

@ -166,7 +166,7 @@ private:
std::string lenExpression; std::string lenExpression;
std::vector<std::pair<std::string, size_t>> lenParams; std::vector<std::pair<std::string, size_t>> lenParams;
bool optional; bool optional;
std::string stride; std::pair<std::string, size_t> strideParam;
int xmlLine; int xmlLine;
}; };