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 #1351 from asuessenbach/function

Browse Source 
Add support for functions returning some data without error codes.
This commit is contained in:
Andreas Süßenbach 2022-07-12 10:16:02 +02:00 committed by GitHub
commit 24bcbf93d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
VulkanHppGenerator.cpp
View File

@ -3894,33 +3894,51 @@ std::string VulkanHppGenerator::generateCommandResultSingleSuccessNoErrors( std:
size_t initialSkipCount, size_t initialSkipCount,
bool definition ) const bool definition ) const
{ {
std::vector<size_t> returnParams = determineReturnParams( commandData.params ); std::vector<size_t> returnParams = determineReturnParams( commandData.params );
if ( returnParams.empty() ) std::map<size_t, size_t> vectorParams = determineVectorParams( commandData.params );
switch ( returnParams.size() )
{ {
std::map<size_t, size_t> vectorParams = determineVectorParams( commandData.params ); case 0:
if ( vectorParams.empty() ) switch ( vectorParams.size() )
{
std::vector<size_t> constPointerParams = determineConstPointerParams( commandData.params );
if ( constPointerParams.empty() )
{ {
return generateCommandSetStandardOrEnhanced( case 0:
generateCommandStandard( name, commandData, initialSkipCount, definition ), {
generateCommandEnhanced( name, commandData, initialSkipCount, definition, {}, {}, false, false, false, false ) ); std::vector<size_t> constPointerParams = determineConstPointerParams( commandData.params );
if ( constPointerParams.empty() )
{
return generateCommandSetStandardOrEnhanced(
generateCommandStandard( name, commandData, initialSkipCount, definition ),
generateCommandEnhanced( name, commandData, initialSkipCount, definition, {}, {}, false, false, false, false ) );
}
}
break;
case 1:
if ( commandData.params[vectorParams.begin()->second].type.isValue() )
{
if ( isHandleType( commandData.params[vectorParams.begin()->first].type.type ) )
{
return generateCommandSetStandardEnhanced(
definition,
generateCommandStandard( name, commandData, initialSkipCount, definition ),
generateCommandEnhanced( name, commandData, initialSkipCount, definition, vectorParams, {}, false, false, false, false ) );
}
}
break;
} }
} break;
else if ( vectorParams.size() == 1 ) case 1:
{ if ( vectorParams.empty() )
if ( commandData.params[vectorParams.begin()->second].type.isValue() )
{ {
if ( isHandleType( commandData.params[vectorParams.begin()->first].type.type ) ) if ( ( commandData.params[returnParams[0]].type.type != "void" ) && !isHandleType( commandData.params[returnParams[0]].type.type ) &&
!isStructureChainAnchor( commandData.params[returnParams[0]].type.type ) )
{ {
return generateCommandSetStandardEnhanced( return generateCommandSetStandardEnhanced(
definition, definition,
generateCommandStandard( name, commandData, initialSkipCount, definition ), generateCommandStandard( name, commandData, initialSkipCount, definition ),
generateCommandEnhanced( name, commandData, initialSkipCount, definition, vectorParams, {}, false, false, false, false ) ); generateCommandEnhanced( name, commandData, initialSkipCount, definition, vectorParams, returnParams, false, false, false, false ) );
} }
} }
} break;
} }
return ""; return "";
} }
@ -6810,10 +6828,10 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultSingleSuccessNoEr
bool definition ) const bool definition ) const
{ {
std::vector<size_t> returnParams = determineReturnParams( commandIt->second.params ); std::vector<size_t> returnParams = determineReturnParams( commandIt->second.params );
if ( returnParams.empty() ) if ( returnParams.size() < 2 )
{ {
return generateRAIIHandleCommandEnhanced( std::map<size_t, size_t> vectorParams = determineVectorParams( commandIt->second.params );
commandIt, initialSkipCount, returnParams, determineVectorParams( commandIt->second.params ), definition, false, false ); return generateRAIIHandleCommandEnhanced( commandIt, initialSkipCount, returnParams, vectorParams, definition, false, false );
} }
return ""; return "";
} }
@ -8505,14 +8523,14 @@ std::string VulkanHppGenerator::generateReturnStatement( std::string const & com
if ( ( commandData.successCodes.size() == 1 ) || enumerating ) if ( ( commandData.successCodes.size() == 1 ) || enumerating )
{ {
assert( commandData.successCodes[0] == "VK_SUCCESS" ); assert( commandData.successCodes[0] == "VK_SUCCESS" );
if ( raii ) if ( raii || commandData.errorCodes.empty() )
{ {
if ( !returnVariable.empty() ) if ( !returnVariable.empty() )
{ {
returnStatement = "return " + returnVariable + ";"; returnStatement = "return " + returnVariable + ";";
} }
} }
else if ( !commandData.errorCodes.empty() ) else
{ {
if ( returnVariable.empty() ) if ( returnVariable.empty() )
{ {
@ -8660,7 +8678,7 @@ std::string VulkanHppGenerator::generateReturnType(
{ {
assert( assert(
( ( commandData.successCodes.size() == 1 ) || ( ( commandData.successCodes.size() == 2 ) && ( commandData.successCodes[1] == "VK_INCOMPLETE" ) ) ) && ( ( commandData.successCodes.size() == 1 ) || ( ( commandData.successCodes.size() == 2 ) && ( commandData.successCodes[1] == "VK_INCOMPLETE" ) ) ) &&
!commandData.errorCodes.empty() && ( returnParams.size() <= 3 ) ); ( returnParams.size() <= 3 ) );
returnType = raii ? modifiedDataType : ( "typename ResultValueType<" + modifiedDataType + ">::type" ); returnType = raii ? modifiedDataType : ( "typename ResultValueType<" + modifiedDataType + ">::type" );
} }
} }