From 2a55e8ef2f68d0cfdd4b12a12c6fc80ae16d963b Mon Sep 17 00:00:00 2001 From: asuessenbach Date: Wed, 3 Nov 2021 09:01:24 +0100 Subject: [PATCH] Minor cleanup work. --- VulkanHppGenerator.cpp | 65 ++++++++++++++++++----------------------- VulkanHppGenerator.hpp | 16 +++++----- samples/utils/utils.cpp | 3 +- 3 files changed, 37 insertions(+), 47 deletions(-) diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index 4a8ba4c..dcc9d84 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -7733,15 +7733,14 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultMultiSuccessWithE std::map::const_iterator commandIt, size_t initialSkipCount, std::map const & vectorParamIndices, - std::vector const & nonConstPointerParamIndices, + std::vector const & returnParamIndices, bool definition ) const { - std::set skippedParameters = determineSkippedParams( - commandIt->second.params, initialSkipCount, vectorParamIndices, nonConstPointerParamIndices, false ); + std::set skippedParameters = + determineSkippedParams( commandIt->second.params, initialSkipCount, vectorParamIndices, returnParamIndices, false ); std::string argumentList = generateArgumentListEnhanced( commandIt->second.params, skippedParameters, {}, definition, false, false, false ); std::string commandName = generateCommandName( commandIt->first, commandIt->second.params, initialSkipCount, m_tags ); - std::string vectorElementType = commandIt->second.params[vectorParamIndices.begin()->first].type.type; if ( !isHandleType( vectorElementType ) ) { @@ -7874,11 +7873,11 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultMultiSuccessWithE std::map::const_iterator commandIt, size_t initialSkipCount, std::map const & vectorParamIndices, - std::vector const & nonConstPointerParamIndices, + std::vector const & returnParamIndices, bool definition ) const { - std::set skippedParameters = determineSkippedParams( - commandIt->second.params, initialSkipCount, vectorParamIndices, nonConstPointerParamIndices, false ); + std::set skippedParameters = + determineSkippedParams( commandIt->second.params, initialSkipCount, vectorParamIndices, returnParamIndices, false ); std::string argumentList = generateArgumentListEnhanced( commandIt->second.params, skippedParameters, {}, definition, false, false, false ); auto firstVectorParamIt = vectorParamIndices.begin(); @@ -8117,11 +8116,11 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultSingleSuccessWith std::map::const_iterator commandIt, size_t initialSkipCount, std::map const & vectorParamIndices, - std::vector const & nonConstPointerParamIndices, + std::vector const & returnParamIndices, bool definition ) const { - std::set skippedParameters = determineSkippedParams( - commandIt->second.params, initialSkipCount, vectorParamIndices, nonConstPointerParamIndices, false ); + std::set skippedParameters = + determineSkippedParams( commandIt->second.params, initialSkipCount, vectorParamIndices, returnParamIndices, false ); std::string argumentList = generateArgumentListEnhanced( commandIt->second.params, skippedParameters, {}, definition, false, false, false ); std::string commandName = generateCommandName( commandIt->first, commandIt->second.params, initialSkipCount, m_tags ); @@ -8145,10 +8144,10 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultSingleSuccessWith )"; std::string callArguments = generateCallArgumentsEnhanced( commandIt->second, initialSkipCount, false, {}, true ); - std::string returnType = stripPostfix( - commandIt->second.params[nonConstPointerParamIndices[0]].type.compose( "VULKAN_HPP_NAMESPACE" ), "*" ); + std::string returnType = + stripPostfix( commandIt->second.params[returnParamIndices[0]].type.compose( "VULKAN_HPP_NAMESPACE" ), "*" ); std::string returnVariable = - startLowerCase( stripPrefix( commandIt->second.params[nonConstPointerParamIndices[0]].name, "p" ) ); + startLowerCase( stripPrefix( commandIt->second.params[returnParamIndices[0]].name, "p" ) ); return replaceWithMap( functionTemplate, @@ -8191,7 +8190,7 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultSingleSuccessWith { case 0: str = generateRAIIHandleCommandResultSingleSuccessWithErrors1ReturnValue( - commandIt, initialSkipCount, vectorParamIndices, { returnParamIndex }, definition ); + commandIt, initialSkipCount, vectorParamIndices, returnParamIndex, definition ); break; case 1: if ( returnParamIndex == vectorParamIndices.begin()->first ) @@ -8201,7 +8200,7 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultSingleSuccessWith str = generateRAIIHandleCommandResultSingleSuccessWithErrors1ReturnVoidVector( commandIt, initialSkipCount, vectorParamIndices, { returnParamIndex }, definition ); str += generateRAIIHandleCommandResultSingleSuccessWithErrors1ReturnVoidSingular( - commandIt, initialSkipCount, vectorParamIndices, { returnParamIndex }, definition ); + commandIt, initialSkipCount, vectorParamIndices, returnParamIndex, definition ); } } break; @@ -8217,7 +8216,7 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultSingleSuccessWith str = generateRAIIHandleCommandResultSingleSuccessWithErrors1ReturnVoidVector( commandIt, initialSkipCount, vectorParamIndices, { returnParamIndex }, definition ); str += generateRAIIHandleCommandResultSingleSuccessWithErrors1ReturnVoidSingular( - commandIt, initialSkipCount, vectorParamIndices, { returnParamIndex }, definition ); + commandIt, initialSkipCount, vectorParamIndices, returnParamIndex, definition ); } } } @@ -8268,7 +8267,7 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultSingleSuccessWith if ( vectorParamIndices.empty() ) { str = generateRAIIHandleCommandResultSingleSuccessWithErrors1ReturnValue( - commandIt, initialSkipCount, vectorParamIndices, { returnParamIndex }, definition ); + commandIt, initialSkipCount, vectorParamIndices, returnParamIndex, definition ); str += generateRAIIHandleCommandResultSingleSuccessWithErrors1ReturnChain( commandIt, initialSkipCount, vectorParamIndices, { returnParamIndex }, definition ); } @@ -8279,7 +8278,7 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultSingleSuccessWith { case 0: str = generateRAIIHandleCommandResultSingleSuccessWithErrors1ReturnValue( - commandIt, initialSkipCount, vectorParamIndices, { returnParamIndex }, definition ); + commandIt, initialSkipCount, vectorParamIndices, returnParamIndex, definition ); break; case 2: if ( returnParamIndex == std::next( vectorParamIndices.begin() )->first ) @@ -8310,18 +8309,16 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultSingleSuccessWith std::map::const_iterator commandIt, size_t initialSkipCount, std::map const & vectorParamIndices, - std::vector const & nonConstPointerParamIndices, + size_t returnParamIndex, bool definition ) const { - assert( nonConstPointerParamIndices.size() == 1 ); - std::set skippedParameters = determineSkippedParams( - commandIt->second.params, initialSkipCount, vectorParamIndices, nonConstPointerParamIndices, false ); + commandIt->second.params, initialSkipCount, vectorParamIndices, { returnParamIndex }, false ); std::string argumentList = generateArgumentListEnhanced( commandIt->second.params, skippedParameters, {}, definition, false, false, false ); std::string commandName = generateCommandName( commandIt->first, commandIt->second.params, initialSkipCount, m_tags ); - std::string returnType = stripPostfix( - commandIt->second.params[nonConstPointerParamIndices[0]].type.compose( "VULKAN_HPP_NAMESPACE" ), "*" ); + std::string returnType = + stripPostfix( commandIt->second.params[returnParamIndex].type.compose( "VULKAN_HPP_NAMESPACE" ), "*" ); std::string typenameT; if ( returnType == "void" ) { @@ -8346,8 +8343,7 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultSingleSuccessWith )"; std::string callArguments = generateCallArgumentsEnhanced( commandIt->second, initialSkipCount, false, {}, true ); - std::string valueName = - startLowerCase( stripPrefix( commandIt->second.params[nonConstPointerParamIndices[0]].name, "p" ) ); + std::string valueName = startLowerCase( stripPrefix( commandIt->second.params[returnParamIndex].name, "p" ) ); return replaceWithMap( definitionTemplate, @@ -8397,9 +8393,8 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultSingleSuccessWith commandIt->second.params, skippedParameters, singularParams, definition, false, false, false ); std::string commandName = stripPluralS( generateCommandName( commandIt->first, commandIt->second.params, initialSkipCount, m_tags ) ); - assert( beginsWith( commandIt->second.params[returnParamIndex].type.type, "Vk" ) ); std::string dataType = - "VULKAN_HPP_NAMESPACE::" + stripPrefix( commandIt->second.params[returnParamIndex].type.type, "Vk" ); + stripPostfix( commandIt->second.params[returnParamIndex].type.compose( "VULKAN_HPP_NAMESPACE" ), " *" ); if ( definition ) { @@ -8459,9 +8454,8 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultSingleSuccessWith std::string argumentList = generateArgumentListEnhanced( commandIt->second.params, skippedParameters, {}, definition, false, false, false ); std::string commandName = generateCommandName( commandIt->first, commandIt->second.params, initialSkipCount, m_tags ); - assert( beginsWith( commandIt->second.params[returnParamIndex].type.type, "Vk" ) ); std::string elementType = - "VULKAN_HPP_NAMESPACE::" + stripPrefix( commandIt->second.params[returnParamIndex].type.type, "Vk" ); + stripPostfix( commandIt->second.params[returnParamIndex].type.compose( "VULKAN_HPP_NAMESPACE" ), " *" ); if ( definition ) { @@ -8511,14 +8505,12 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultSingleSuccessWith std::map::const_iterator commandIt, size_t initialSkipCount, std::map const & vectorParamIndices, - std::vector const & nonConstPointerParamIndices, + size_t returnParamIndex, bool definition ) const { - assert( nonConstPointerParamIndices.size() == 1 ); - std::set skippedParameters = determineSkippedParams( - commandIt->second.params, initialSkipCount, vectorParamIndices, nonConstPointerParamIndices, true ); - std::set singularParams = determineSingularParams( nonConstPointerParamIndices[0], vectorParamIndices ); + commandIt->second.params, initialSkipCount, vectorParamIndices, { returnParamIndex }, true ); + std::set singularParams = determineSingularParams( returnParamIndex, vectorParamIndices ); std::string argumentList = generateArgumentListEnhanced( commandIt->second.params, skippedParameters, singularParams, definition, false, false, false ); std::string commandName = @@ -8543,8 +8535,7 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultSingleSuccessWith std::string callArguments = generateCallArgumentsEnhanced( commandIt->second, initialSkipCount, false, singularParams, true ); - std::string dataName = - startLowerCase( stripPrefix( commandIt->second.params[nonConstPointerParamIndices[0]].name, "p" ) ); + std::string dataName = startLowerCase( stripPrefix( commandIt->second.params[returnParamIndex].name, "p" ) ); return replaceWithMap( singularDefinitionTemplate, diff --git a/VulkanHppGenerator.hpp b/VulkanHppGenerator.hpp index e67de99..3d5c31c 100644 --- a/VulkanHppGenerator.hpp +++ b/VulkanHppGenerator.hpp @@ -942,7 +942,7 @@ private: std::map::const_iterator commandIt, size_t initialSkipCount, std::map const & vectorParamIndices, - std::vector const & nonConstPointerParamIndices, + std::vector const & returnParamIndices, bool definition ) const; std::string generateRAIIHandleCommandResultMultiSuccessWithErrors3Return( std::map::const_iterator commandIt, @@ -953,7 +953,7 @@ private: std::map::const_iterator commandIt, size_t initialSkipCount, std::map const & vectorParamIndices, - std::vector const & nonConstPointerParamIndices, + std::vector const & returnParamIndices, bool definition ) const; std::string generateRAIIHandleCommandResultSingleSuccessNoErrors( std::map::const_iterator commandIt, size_t initialSkipCount, bool definition ) const; @@ -973,7 +973,7 @@ private: std::map::const_iterator commandIt, size_t initialSkipCount, std::map const & vectorParamIndices, - std::vector const & nonConstPointerParamIndices, + std::vector const & returnParamIndices, bool definition ) const; std::string generateRAIIHandleCommandResultSingleSuccessWithErrors1Return( std::map::const_iterator commandIt, @@ -984,7 +984,7 @@ private: std::map::const_iterator commandIt, size_t initialSkipCount, std::map const & vectorParamIndices, - std::vector const & nonConstPointerParamIndices, + size_t returnParamIndex, bool definition ) const; std::string generateRAIIHandleCommandResultSingleSuccessWithErrors1ReturnValueSingular( std::map::const_iterator commandIt, @@ -1002,7 +1002,7 @@ private: std::map::const_iterator commandIt, size_t initialSkipCount, std::map const & vectorParamIndices, - std::vector const & nonConstPointerParamIndices, + size_t returnParamIndex, bool definition ) const; std::string generateRAIIHandleCommandResultSingleSuccessWithErrors1ReturnVoidVector( std::map::const_iterator commandIt, @@ -1134,9 +1134,9 @@ private: std::string generateRAIIHandleContext( std::pair const & handle, std::set const & specialFunctions ) const; std::pair - generateRAIIHandleDestructor( std::string const & handleType, - std::map::const_iterator destructorIt, - std::string const & enter ) const; + generateRAIIHandleDestructor( std::string const & handleType, + std::map::const_iterator destructorIt, + std::string const & enter ) const; std::string generateRAIIHandleDestructorCallArguments( std::string const & handleType, std::map::const_iterator destructorIt ) const; diff --git a/samples/utils/utils.cpp b/samples/utils/utils.cpp index 307c763..069b55b 100644 --- a/samples/utils/utils.cpp +++ b/samples/utils/utils.cpp @@ -1165,8 +1165,7 @@ namespace vk { #if defined( NDEBUG ) // in non-debug mode just use the InstanceCreateInfo for instance creation - vk::StructureChain instanceCreateInfo( - { {}, &applicationInfo, layers, extensions } ); + vk::StructureChain instanceCreateInfo( { {}, &applicationInfo, layers, extensions } ); #else // in debug mode, addionally use the debugUtilsMessengerCallback in instance creation! vk::DebugUtilsMessageSeverityFlagsEXT severityFlags( vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning |