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

Fix wrong usage of 'structureChains' in generating functions returning a StructureChain and a vector of data. (#1594)

Browse Source
This commit is contained in:
Andreas Süßenbach 2023-06-19 12:46:04 +02:00 committed by GitHub
parent babfbddf32
commit c55cf16397
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
VulkanHppGenerator.cpp
View File

@ -2234,22 +2234,7 @@ std::string VulkanHppGenerator::generateArgumentListEnhanced( std::vector<ParamD
} }
if ( withAllocators ) if ( withAllocators )
{ {
bool useStructureChainAllocator = false; if ( ( flavourFlags & CommandFlavourFlagBits::chained ) && needsStructureChainResize( vectorParams, chainedReturnParams ) )
if ( flavourFlags & CommandFlavourFlagBits::chained )
{
// use StructureChainAllocator only, if a vector param is a chained return param
auto it = std::find_if(
chainedReturnParams.begin(), chainedReturnParams.end(), [&vectorParams]( size_t crp ) { return vectorParams.find( crp ) != vectorParams.end(); } );
if ( it != chainedReturnParams.end() )
{
// assert that there's no other chained vector param !
assert( std::find_if( std::next( it ),
chainedReturnParams.end(),
[&vectorParams]( size_t crp ) { return vectorParams.find( crp ) != vectorParams.end(); } ) == chainedReturnParams.end() );
useStructureChainAllocator = true;
}
}
if ( useStructureChainAllocator )
{ {
if ( encounteredArgument ) if ( encounteredArgument )
{ {
@ -2928,6 +2913,7 @@ std::string VulkanHppGenerator::generateCallSequence( std::string const &
size_t initialSkipCount, size_t initialSkipCount,
std::set<size_t> const & singularParams, std::set<size_t> const & singularParams,
std::set<size_t> const & templatedParams, std::set<size_t> const & templatedParams,
std::vector<size_t> const & chainedReturnParams,
CommandFlavourFlags flavourFlags, CommandFlavourFlags flavourFlags,
bool raii ) const bool raii ) const
{ {
@ -2951,7 +2937,7 @@ std::string VulkanHppGenerator::generateCallSequence( std::string const &
std::string vectorName = startLowerCase( stripPrefix( commandData.params[vectorParamIt->first].name, "p" ) ); std::string vectorName = startLowerCase( stripPrefix( commandData.params[vectorParamIt->first].name, "p" ) );
std::string vectorSize = startLowerCase( stripPrefix( commandData.params[vectorParamIt->second.lenParam].name, "p" ) ); std::string vectorSize = startLowerCase( stripPrefix( commandData.params[vectorParamIt->second.lenParam].name, "p" ) );
if ( flavourFlags & CommandFlavourFlagBits::chained ) if ( ( flavourFlags & CommandFlavourFlagBits::chained ) && needsStructureChainResize( vectorParams, chainedReturnParams ) )
{ {
assert( vectorParams.size() == 1 ); assert( vectorParams.size() == 1 );
// chained data needs some more handling!! // chained data needs some more handling!!
@ -3282,8 +3268,8 @@ std::string VulkanHppGenerator::generateCommandEnhanced( std::string const &
std::string dataPreparation = std::string dataPreparation =
generateDataPreparation( commandData, initialSkipCount, returnParams, vectorParams, templatedParams, flavourFlags, enumerating ); generateDataPreparation( commandData, initialSkipCount, returnParams, vectorParams, templatedParams, flavourFlags, enumerating );
std::string dataSizeChecks = generateDataSizeChecks( commandData, returnParams, dataTypes, vectorParams, templatedParams, singular ); std::string dataSizeChecks = generateDataSizeChecks( commandData, returnParams, dataTypes, vectorParams, templatedParams, singular );
std::string callSequence = std::string callSequence = generateCallSequence(
generateCallSequence( name, commandData, returnParams, vectorParams, initialSkipCount, singularParams, templatedParams, flavourFlags, false ); name, commandData, returnParams, vectorParams, initialSkipCount, singularParams, templatedParams, chainedReturnParams, flavourFlags, false );
std::string resultCheck = generateResultCheck( commandData, className, classSeparator, commandName, enumerating ); std::string resultCheck = generateResultCheck( commandData, className, classSeparator, commandName, enumerating );
std::string returnStatement = generateReturnStatement( name, std::string returnStatement = generateReturnStatement( name,
commandData, commandData,
@ -7391,8 +7377,8 @@ ${vectorSizeCheck}
} }
)"; )";
std::string callSequence = std::string callSequence = generateCallSequence(
generateCallSequence( name, commandData, returnParams, vectorParams, initialSkipCount, singularParams, templatedParams, flavourFlags, true ); name, commandData, returnParams, vectorParams, initialSkipCount, singularParams, templatedParams, chainedReturnParams, flavourFlags, true );
std::string className = initialSkipCount ? stripPrefix( commandData.params[initialSkipCount - 1].type.type, "Vk" ) : "Context"; std::string className = initialSkipCount ? stripPrefix( commandData.params[initialSkipCount - 1].type.type, "Vk" ) : "Context";
std::string returnVariable = generateReturnVariable( commandData, returnParams, vectorParams, flavourFlags ); std::string returnVariable = generateReturnVariable( commandData, returnParams, vectorParams, flavourFlags );
std::string dataDeclarations = std::string dataDeclarations =
@ -11445,6 +11431,19 @@ bool VulkanHppGenerator::isTypeUsed( std::string const & type ) const
return false; return false;
} }
bool VulkanHppGenerator::needsStructureChainResize( std::map<size_t, VectorParamData> const & vectorParams,
std::vector<size_t> const & chainedReturnParams ) const
{
auto it = std::find_if(
chainedReturnParams.begin(), chainedReturnParams.end(), [&vectorParams]( size_t crp ) { return vectorParams.find( crp ) != vectorParams.end(); } );
// assert that there's no other chained vector param !
assert(
( it == chainedReturnParams.end() ) ||
( std::find_if( std::next( it ), chainedReturnParams.end(), [&vectorParams]( size_t crp ) { return vectorParams.find( crp ) != vectorParams.end(); } ) ==
chainedReturnParams.end() ) );
return ( it != chainedReturnParams.end() );
}
std::pair<bool, std::map<size_t, std::vector<size_t>>> VulkanHppGenerator::needsVectorSizeCheck( std::vector<ParamData> const & params, std::pair<bool, std::map<size_t, std::vector<size_t>>> VulkanHppGenerator::needsVectorSizeCheck( std::vector<ParamData> const & params,
std::map<size_t, VectorParamData> const & vectorParams, std::map<size_t, VectorParamData> const & vectorParams,
std::vector<size_t> const & returnParams, std::vector<size_t> const & returnParams,

2
VulkanHppGenerator.hpp
View File

@ -540,6 +540,7 @@ private:
size_t initialSkipCount, size_t initialSkipCount,
std::set<size_t> const & singularParams, std::set<size_t> const & singularParams,
std::set<size_t> const & templatedParams, std::set<size_t> const & templatedParams,
std::vector<size_t> const & chainedReturnParams,
CommandFlavourFlags flavourFlags, CommandFlavourFlags flavourFlags,
bool raii ) const; bool raii ) const;
std::string generateChainTemplates( std::vector<size_t> const & returnParams, bool chained ) const; std::string generateChainTemplates( std::vector<size_t> const & returnParams, bool chained ) const;
@ -936,6 +937,7 @@ private:
bool isSupportedFeature( std::string const & name ) const; bool isSupportedFeature( std::string const & name ) const;
bool isTypeRequired( std::string const & type ) const; bool isTypeRequired( std::string const & type ) const;
bool isTypeUsed( std::string const & type ) const; bool isTypeUsed( std::string const & type ) const;
bool needsStructureChainResize( std::map<size_t, VectorParamData> const & vectorParams, std::vector<size_t> const & chainedReturnParams ) const;
std::pair<bool, std::map<size_t, std::vector<size_t>>> needsVectorSizeCheck( std::vector<ParamData> const & params, std::pair<bool, std::map<size_t, std::vector<size_t>>> needsVectorSizeCheck( std::vector<ParamData> const & params,
std::map<size_t, VectorParamData> const & vectorParams, std::map<size_t, VectorParamData> const & vectorParams,
std::vector<size_t> const & returnParams, std::vector<size_t> const & returnParams,

8
tests/EnableBetaExtensions/EnableBetaExtensions.cpp
View File

@ -18,7 +18,13 @@
#define VK_ENABLE_BETA_EXTENSIONS #define VK_ENABLE_BETA_EXTENSIONS
#include <vulkan/vulkan.hpp> #include <vulkan/vulkan.hpp>
int main(int /*argc*/, char** /*argv*/) int main( int /*argc*/, char ** /*argv*/ )
{ {
vk::Device device;
vk::VideoEncodeSessionParametersGetInfoKHR videoSessionParametersInfo;
auto stuff = device.getEncodedVideoSessionParametersKHR<vk::VideoEncodeSessionParametersFeedbackInfoKHR,
vk::VideoEncodeH264SessionParametersFeedbackInfoEXT,
vk::VideoEncodeH265SessionParametersFeedbackInfoEXT>( videoSessionParametersInfo );
return 0; return 0;
} }

10
vulkan/vulkan_funcs.hpp
View File

@ -18660,12 +18660,7 @@ namespace VULKAN_HPP_NAMESPACE
nullptr ); nullptr );
if ( ( result == VK_SUCCESS ) && dataSize ) if ( ( result == VK_SUCCESS ) && dataSize )
{ {
structureChains.resize( dataSize );
data.resize( dataSize ); data.resize( dataSize );
for ( size_t i = 0; i < dataSize; i++ )
{
data[i].pNext = structureChains[i].template get<void>().pNext;
}
result = d.vkGetEncodedVideoSessionParametersKHR( m_device, result = d.vkGetEncodedVideoSessionParametersKHR( m_device,
reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ), reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ),
reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( &feedbackInfo ), reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( &feedbackInfo ),
@ -18709,12 +18704,7 @@ namespace VULKAN_HPP_NAMESPACE
nullptr ); nullptr );
if ( ( result == VK_SUCCESS ) && dataSize ) if ( ( result == VK_SUCCESS ) && dataSize )
{ {
structureChains.resize( dataSize );
data.resize( dataSize ); data.resize( dataSize );
for ( size_t i = 0; i < dataSize; i++ )
{
data[i].pNext = structureChains[i].template get<void>().pNext;
}
result = d.vkGetEncodedVideoSessionParametersKHR( m_device, result = d.vkGetEncodedVideoSessionParametersKHR( m_device,
reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ), reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ),
reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( &feedbackInfo ), reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( &feedbackInfo ),

5
vulkan/vulkan_raii.hpp
View File

@ -18567,12 +18567,7 @@ namespace VULKAN_HPP_NAMESPACE
nullptr ); nullptr );
if ( ( result == VK_SUCCESS ) && dataSize ) if ( ( result == VK_SUCCESS ) && dataSize )
{ {
structureChains.resize( dataSize );
data.resize( dataSize ); data.resize( dataSize );
for ( size_t i = 0; i < dataSize; i++ )
{
data[i].pNext = structureChains[i].template get<void>().pNext;
}
result = getDispatcher()->vkGetEncodedVideoSessionParametersKHR( result = getDispatcher()->vkGetEncodedVideoSessionParametersKHR(
static_cast<VkDevice>( m_device ), static_cast<VkDevice>( m_device ),
reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ), reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ),