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 #800 from asuessenbach/fix

Browse Source 
Correct size and pointer arguments for singular versions of a command
This commit is contained in:
Andreas Süßenbach 2020-10-22 20:25:00 +02:00 committed by GitHub
commit 1a98c5efd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
VulkanHppGenerator.cpp
View File

@ -3696,7 +3696,8 @@ std::string VulkanHppGenerator::constructCallArgument( ParamData const & param,
} }
else if ( enhanced && ( ( param.type.type == "Display" ) || ( param.type.type == "IDirectFB" ) ) ) else if ( enhanced && ( ( param.type.type == "Display" ) || ( param.type.type == "IDirectFB" ) ) )
{ {
// very special handling for type "Display" and "IDirectFB", which originally gets in as a pointer, but is mapped to a reference // very special handling for type "Display" and "IDirectFB", which originally gets in as a pointer, but is mapped to
// a reference
argument = "&" + param.name; argument = "&" + param.name;
} }
else else
@ -3830,6 +3831,12 @@ std::string VulkanHppGenerator::constructCallArgumentsGetVector( std::string con
std::map<size_t, size_t> const & vectorParamIndices, std::map<size_t, size_t> const & vectorParamIndices,
bool singular ) const bool singular ) const
{ {
assert( !singular ||
( returnParamIndices.size() == 1 ) ); // for singular cases, we always return just one parameter!
auto singularReturnVectorParamIt = vectorParamIndices.find( returnParamIndices[0] );
assert( singularReturnVectorParamIt != vectorParamIndices.end() );
std::string arguments; std::string arguments;
size_t i = 0; size_t i = 0;
if ( !handle.empty() ) if ( !handle.empty() )
@ -3841,11 +3848,11 @@ std::string VulkanHppGenerator::constructCallArgumentsGetVector( std::string con
for ( ; i < params.size(); i++ ) for ( ; i < params.size(); i++ )
{ {
arguments += ", "; arguments += ", ";
auto vpiIt = vectorParamIndices.find( i ); auto vpiIt = vectorParamIndices.find( i );
if ( ( std::find_if( returnParamIndices.begin(), bool isReturnParam = ( std::find_if( returnParamIndices.begin(), returnParamIndices.end(), [&i]( size_t rpi ) {
returnParamIndices.end(), return i == rpi;
[&i]( size_t rpi ) { return i == rpi; } ) != returnParamIndices.end() ) || } ) != returnParamIndices.end() );
( vpiIt != vectorParamIndices.end() ) ) if ( isReturnParam || ( vpiIt != vectorParamIndices.end() ) )
{ {
if ( vpiIt == vectorParamIndices.end() ) if ( vpiIt == vectorParamIndices.end() )
{ {
@ -3854,7 +3861,7 @@ std::string VulkanHppGenerator::constructCallArgumentsGetVector( std::string con
} }
else else
{ {
if ( singular ) if ( singular && ( vpiIt->second == singularReturnVectorParamIt->second ) )
{ {
arguments += "reinterpret_cast<" + params[i].type.compose( false ) + ">( &" + arguments += "reinterpret_cast<" + params[i].type.compose( false ) + ">( &" +
stripPluralS( startLowerCase( stripPrefix( params[i].name, "p" ) ) ) + " )"; stripPluralS( startLowerCase( stripPrefix( params[i].name, "p" ) ) ) + " )";
@ -3874,12 +3881,12 @@ std::string VulkanHppGenerator::constructCallArgumentsGetVector( std::string con
{ {
auto lenIt = std::find_if( vectorParamIndices.begin(), auto lenIt = std::find_if( vectorParamIndices.begin(),
vectorParamIndices.end(), vectorParamIndices.end(),
[&i]( std::pair<size_t, size_t> const & vpi ) { return vpi.second == i; } ); [&i]( std::pair<size_t, size_t> const & vpi ) { return i == vpi.second; } );
if ( lenIt != vectorParamIndices.end() ) if ( lenIt != vectorParamIndices.end() )
{ {
if ( singular ) if ( singular && ( i == singularReturnVectorParamIt->second ) )
{ {
arguments += ( params[lenIt->first].type.type == "void" ) ? "sizeof( T )" : "1"; arguments += ( params[singularReturnVectorParamIt->first].type.type == "void" ) ? "sizeof( T )" : "1";
} }
else if ( params[lenIt->second].type.isValue() ) else if ( params[lenIt->second].type.isValue() )
{ {
@ -7401,9 +7408,11 @@ std::vector<size_t> VulkanHppGenerator::determineConstPointerParamIndices( std::
for ( size_t i = 0; i < params.size(); i++ ) for ( size_t i = 0; i < params.size(); i++ )
{ {
// very special handling for type Display and IDirectFB, which come in as non-const pointers, but are meant as const-pointers // very special handling for type Display and IDirectFB, which come in as non-const pointers, but are meant as
// const-pointers
if ( params[i].type.isConstPointer() || if ( params[i].type.isConstPointer() ||
( params[i].type.isNonConstPointer() && ( ( params[i].type.type == "Display" ) || ( params[i].type.type == "IDirectFB" ) ) ) ) ( params[i].type.isNonConstPointer() &&
( ( params[i].type.type == "Display" ) || ( params[i].type.type == "IDirectFB" ) ) ) )
{ {
constPointerParamIndices.push_back( i ); constPointerParamIndices.push_back( i );
} }

4
vulkan/vulkan.hpp
View File

@ -101874,8 +101874,8 @@ namespace VULKAN_HPP_NAMESPACE
T data; T data;
Result result = static_cast<Result>( d.vkWriteAccelerationStructuresPropertiesKHR( Result result = static_cast<Result>( d.vkWriteAccelerationStructuresPropertiesKHR(
m_device, m_device,
1, accelerationStructures.size(),
reinterpret_cast<const VkAccelerationStructureKHR *>( &accelerationStructure ), reinterpret_cast<const VkAccelerationStructureKHR *>( accelerationStructures.data() ),
static_cast<VkQueryType>( queryType ), static_cast<VkQueryType>( queryType ),
sizeof( T ), sizeof( T ),
reinterpret_cast<void *>( &data ), reinterpret_cast<void *>( &data ),