mirror of
https://github.com/KhronosGroup/Vulkan-Hpp.git
synced 2024-10-14 16:32:17 +00:00
Merge pull request #1244 from asuessenbach/function
Combine two types of commands into one generation function.
This commit is contained in:
commit
60b8b4cf1d
@ -3119,47 +3119,93 @@ std::string VulkanHppGenerator::generateCommandName( std::string const &
|
|||||||
return commandName;
|
return commandName;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string VulkanHppGenerator::generateCommandResult(
|
std::string VulkanHppGenerator::generateCommandResult( std::string const & name,
|
||||||
std::string const & name, CommandData const & commandData, size_t initialSkipCount, bool definition, std::map<size_t, size_t> const & vectorParams ) const
|
CommandData const & commandData,
|
||||||
|
size_t initialSkipCount,
|
||||||
|
bool definition,
|
||||||
|
std::map<size_t, size_t> const & vectorParams,
|
||||||
|
std::vector<size_t> const & returnParams,
|
||||||
|
bool singular ) const
|
||||||
{
|
{
|
||||||
std::set<size_t> skippedParams = determineSkippedParams( commandData.params, initialSkipCount, vectorParams, {}, false );
|
assert( commandData.returnType == "VkResult" );
|
||||||
std::set<size_t> templatedParams = determineVoidPointerParams( commandData.params );
|
assert( returnParams.size() <= 1 );
|
||||||
std::string argumentList = generateArgumentListEnhanced( commandData.params, skippedParams, {}, templatedParams, definition, false, false, true );
|
assert( !singular || !returnParams.empty() ); // if singular is true, returnParams is not empty !
|
||||||
|
|
||||||
|
std::string commandName = generateCommandName( name, commandData.params, initialSkipCount, m_tags );
|
||||||
|
|
||||||
|
std::set<size_t> skippedParams = determineSkippedParams( commandData.params, initialSkipCount, vectorParams, returnParams, singular );
|
||||||
|
// special handling for vkGetMemoryHostPointerPropertiesEXT: here, we really need to stick with the const void * parameter !
|
||||||
|
std::set<size_t> templatedParams = ( name == "vkGetMemoryHostPointerPropertiesEXT" ) ? std::set<size_t>() : determineVoidPointerParams( commandData.params );
|
||||||
|
std::set<size_t> singularParams;
|
||||||
|
if ( singular )
|
||||||
|
{
|
||||||
|
singularParams = determineSingularParams( returnParams[0], vectorParams );
|
||||||
|
commandName = stripPluralS( commandName );
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string argumentList = generateArgumentListEnhanced( commandData.params, skippedParams, singularParams, templatedParams, definition, false, false, true );
|
||||||
std::string argumentTemplates = generateArgumentTemplates( commandData.params, templatedParams, false );
|
std::string argumentTemplates = generateArgumentTemplates( commandData.params, templatedParams, false );
|
||||||
std::string chainTemplates = "";
|
std::string chainTemplates = "";
|
||||||
std::string commandName = generateCommandName( name, commandData.params, initialSkipCount, m_tags );
|
|
||||||
std::string nodiscard = generateNoDiscard( 1 < commandData.successCodes.size(), 1 < commandData.errorCodes.size() );
|
std::string nodiscard = generateNoDiscard( 1 < commandData.successCodes.size(), 1 < commandData.errorCodes.size() );
|
||||||
std::string noexceptString = commandData.errorCodes.empty() ? " VULKAN_HPP_NOEXCEPT" : "";
|
std::string noexceptString = commandData.errorCodes.empty() ? " VULKAN_HPP_NOEXCEPT" : "";
|
||||||
std::string returnType = ( 1 < commandData.successCodes.size() ) ? "Result" : "typename ResultValueType<void>::type";
|
|
||||||
|
std::string dataType;
|
||||||
|
if ( !returnParams.empty() )
|
||||||
|
{
|
||||||
|
dataType = ( templatedParams.find( returnParams[0] ) != templatedParams.end() )
|
||||||
|
? ( stripPrefix( commandData.params[returnParams[0]].name, "p" ) + "Type" )
|
||||||
|
: stripPostfix( commandData.params[returnParams[0]].type.compose( "VULKAN_HPP_NAMESPACE" ), "*" );
|
||||||
|
}
|
||||||
|
std::string returnType = generateReturnType( commandData.successCodes, dataType.empty() ? "void" : dataType );
|
||||||
|
|
||||||
if ( definition )
|
if ( definition )
|
||||||
{
|
{
|
||||||
|
std::string dataDeclarations, dataResult;
|
||||||
|
if ( !returnParams.empty() )
|
||||||
|
{
|
||||||
|
std::string dataVariable = startLowerCase( stripPrefix( commandData.params[returnParams[0]].name, "p" ) );
|
||||||
|
if ( singular )
|
||||||
|
{
|
||||||
|
dataVariable = stripPluralS( dataVariable );
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string const dataDeclarationTemplate = R"(${dataType} ${dataVariable};)";
|
||||||
|
dataDeclarations = replaceWithMap( dataDeclarationTemplate, { { "dataType", dataType }, { "dataVariable", dataVariable } } );
|
||||||
|
|
||||||
|
std::string const dataResultTemplate = R"(${dataVariable}, )";
|
||||||
|
dataResult = replaceWithMap( dataResultTemplate, { { "dataVariable", dataVariable } } );
|
||||||
|
}
|
||||||
|
|
||||||
std::string const functionTemplate =
|
std::string const functionTemplate =
|
||||||
R"( template <${argumentTemplates}${chainTemplates}typename Dispatch>
|
R"( template <${argumentTemplates}${chainTemplates}typename Dispatch>
|
||||||
${nodiscard}VULKAN_HPP_INLINE ${returnType} ${className}${classSeparator}${commandName}( ${argumentList} )${const}${noexcept}
|
${nodiscard}VULKAN_HPP_INLINE ${returnType} ${className}${classSeparator}${commandName}( ${argumentList} )${const}${noexcept}
|
||||||
{
|
{
|
||||||
VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );${vectorSizeCheck}
|
VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
|
||||||
|
${vectorSizeCheck}
|
||||||
|
${dataDeclarations}
|
||||||
Result result = static_cast<Result>( d.${vkCommand}( ${callArguments} ) );
|
Result result = static_cast<Result>( d.${vkCommand}( ${callArguments} ) );
|
||||||
return createResultValue( result, VULKAN_HPP_NAMESPACE_STRING "::${className}${classSeparator}${commandName}"${successCodeList} );
|
return createResultValue( result, ${dataResult}VULKAN_HPP_NAMESPACE_STRING "::${className}${classSeparator}${commandName}"${successCodeList} );
|
||||||
})";
|
})";
|
||||||
|
|
||||||
std::pair<bool, std::map<size_t, std::vector<size_t>>> vectorSizeCheck = needsVectorSizeCheck( commandData.params, vectorParams, {} );
|
std::pair<bool, std::map<size_t, std::vector<size_t>>> vectorSizeCheck = needsVectorSizeCheck( commandData.params, vectorParams, singularParams );
|
||||||
return replaceWithMap(
|
return replaceWithMap(
|
||||||
functionTemplate,
|
functionTemplate,
|
||||||
{ { "argumentList", argumentList },
|
{ { "argumentList", argumentList },
|
||||||
{ "argumentTemplates", argumentTemplates },
|
{ "argumentTemplates", argumentTemplates },
|
||||||
{ "callArguments", generateCallArgumentsEnhanced( commandData, initialSkipCount, false, {}, templatedParams, false ) },
|
{ "callArguments", generateCallArgumentsEnhanced( commandData, initialSkipCount, false, singularParams, templatedParams, false ) },
|
||||||
{ "chainTemplates", chainTemplates },
|
{ "chainTemplates", chainTemplates },
|
||||||
{ "className", initialSkipCount ? stripPrefix( commandData.params[initialSkipCount - 1].type.type, "Vk" ) : "" },
|
{ "className", initialSkipCount ? stripPrefix( commandData.params[initialSkipCount - 1].type.type, "Vk" ) : "" },
|
||||||
{ "classSeparator", commandData.handle.empty() ? "" : "::" },
|
{ "classSeparator", commandData.handle.empty() ? "" : "::" },
|
||||||
{ "commandName", commandName },
|
{ "commandName", commandName },
|
||||||
{ "const", commandData.handle.empty() ? "" : " const" },
|
{ "const", commandData.handle.empty() ? "" : " const" },
|
||||||
|
{ "dataDeclarations", dataDeclarations },
|
||||||
|
{ "dataResult", dataResult },
|
||||||
{ "nodiscard", nodiscard },
|
{ "nodiscard", nodiscard },
|
||||||
{ "noexcept", noexceptString },
|
{ "noexcept", noexceptString },
|
||||||
{ "returnType", returnType },
|
{ "returnType", returnType },
|
||||||
{ "successCodeList", generateSuccessCodeList( commandData.successCodes ) },
|
{ "successCodeList", generateSuccessCodeList( commandData.successCodes ) },
|
||||||
{ "vectorSizeCheck",
|
{ "vectorSizeCheck",
|
||||||
vectorSizeCheck.first ? generateVectorSizeCheck( name, commandData, initialSkipCount, vectorSizeCheck.second, skippedParams ) : "" },
|
vectorSizeCheck.first ? generateVectorSizeCheck( name, commandData, initialSkipCount, vectorSizeCheck.second, skippedParams, false ) : "" },
|
||||||
{ "vkCommand", name } } );
|
{ "vkCommand", name } } );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -3663,89 +3709,6 @@ std::string VulkanHppGenerator::generateCommandResultGetSingularAndValue( std::s
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string VulkanHppGenerator::generateCommandResultGetValue( std::string const & name,
|
|
||||||
CommandData const & commandData,
|
|
||||||
size_t initialSkipCount,
|
|
||||||
bool definition,
|
|
||||||
std::map<size_t, size_t> const & vectorParams,
|
|
||||||
size_t returnParam,
|
|
||||||
bool singular ) const
|
|
||||||
{
|
|
||||||
assert( commandData.returnType == "VkResult" );
|
|
||||||
|
|
||||||
std::set<size_t> skippedParams = determineSkippedParams( commandData.params, initialSkipCount, vectorParams, { returnParam }, singular );
|
|
||||||
// special handling for vkGetMemoryHostPointerPropertiesEXT: here, we really need to stick with the const void * parameter !
|
|
||||||
std::set<size_t> templatedParams = ( name == "vkGetMemoryHostPointerPropertiesEXT" ) ? std::set<size_t>() : determineVoidPointerParams( commandData.params );
|
|
||||||
std::set<size_t> singularParams = singular ? determineSingularParams( returnParam, vectorParams ) : std::set<size_t>();
|
|
||||||
std::string argumentList = generateArgumentListEnhanced( commandData.params, skippedParams, singularParams, templatedParams, definition, false, false, true );
|
|
||||||
std::string commandName = generateCommandName( name, commandData.params, initialSkipCount, m_tags );
|
|
||||||
if ( singular )
|
|
||||||
{
|
|
||||||
commandName = stripPluralS( commandName );
|
|
||||||
}
|
|
||||||
std::string nodiscard = generateNoDiscard( 1 < commandData.successCodes.size(), 1 < commandData.errorCodes.size() );
|
|
||||||
std::string noexceptString = commandData.errorCodes.empty() ? " VULKAN_HPP_NOEXCEPT" : "";
|
|
||||||
std::string argumentTemplates = generateArgumentTemplates( commandData.params, templatedParams, false );
|
|
||||||
std::string dataType = ( templatedParams.find( returnParam ) != templatedParams.end() )
|
|
||||||
? ( stripPrefix( commandData.params[returnParam].name, "p" ) + "Type" )
|
|
||||||
: stripPostfix( commandData.params[returnParam].type.compose( "VULKAN_HPP_NAMESPACE" ), "*" );
|
|
||||||
std::string returnType = generateReturnType( commandData.successCodes, dataType );
|
|
||||||
|
|
||||||
if ( definition )
|
|
||||||
{
|
|
||||||
std::string const functionTemplate =
|
|
||||||
R"( template <${argumentTemplates}typename Dispatch>
|
|
||||||
${nodiscard}VULKAN_HPP_INLINE ${returnType} ${className}${classSeparator}${commandName}( ${argumentList} )${const}${noexcept}
|
|
||||||
{
|
|
||||||
VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );${vectorSizeCheck}
|
|
||||||
${dataType} ${dataVariable};
|
|
||||||
Result result = static_cast<Result>( d.${vkCommand}( ${callArguments} ) );
|
|
||||||
return createResultValue( result, ${dataVariable}, VULKAN_HPP_NAMESPACE_STRING "::${className}${classSeparator}${commandName}"${successCodeList} );
|
|
||||||
})";
|
|
||||||
|
|
||||||
std::string dataVariable = startLowerCase( stripPrefix( commandData.params[returnParam].name, "p" ) );
|
|
||||||
if ( singular )
|
|
||||||
{
|
|
||||||
dataVariable = stripPluralS( dataVariable );
|
|
||||||
}
|
|
||||||
std::pair<bool, std::map<size_t, std::vector<size_t>>> vectorSizeCheck = needsVectorSizeCheck( commandData.params, vectorParams, singularParams );
|
|
||||||
|
|
||||||
return replaceWithMap(
|
|
||||||
functionTemplate,
|
|
||||||
{ { "argumentList", argumentList },
|
|
||||||
{ "argumentTemplates", argumentTemplates },
|
|
||||||
{ "callArguments", generateCallArgumentsEnhanced( commandData, initialSkipCount, false, singularParams, templatedParams, false ) },
|
|
||||||
{ "className", initialSkipCount ? stripPrefix( commandData.params[initialSkipCount - 1].type.type, "Vk" ) : "" },
|
|
||||||
{ "classSeparator", commandData.handle.empty() ? "" : "::" },
|
|
||||||
{ "const", commandData.handle.empty() ? "" : " const" },
|
|
||||||
{ "commandName", commandName },
|
|
||||||
{ "dataType", dataType },
|
|
||||||
{ "dataVariable", dataVariable },
|
|
||||||
{ "nodiscard", nodiscard },
|
|
||||||
{ "noexcept", noexceptString },
|
|
||||||
{ "returnType", returnType },
|
|
||||||
{ "successCodeList", generateSuccessCodeList( commandData.successCodes ) },
|
|
||||||
{ "vectorSizeCheck",
|
|
||||||
vectorSizeCheck.first ? generateVectorSizeCheck( name, commandData, initialSkipCount, vectorSizeCheck.second, skippedParams ) : "" },
|
|
||||||
{ "vkCommand", name } } );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
std::string const functionTemplate =
|
|
||||||
R"( template <${argumentTemplates}typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
|
||||||
${nodiscard}${returnType} ${commandName}( ${argumentList} )${const}${noexcept};)";
|
|
||||||
|
|
||||||
return replaceWithMap( functionTemplate,
|
|
||||||
{ { "argumentList", argumentList },
|
|
||||||
{ "argumentTemplates", argumentTemplates },
|
|
||||||
{ "commandName", commandName },
|
|
||||||
{ "const", commandData.handle.empty() ? "" : " const" },
|
|
||||||
{ "nodiscard", nodiscard },
|
|
||||||
{ "noexcept", noexceptString },
|
|
||||||
{ "returnType", returnType } } );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string VulkanHppGenerator::generateCommandResultGetVector( std::string const & name,
|
std::string VulkanHppGenerator::generateCommandResultGetVector( std::string const & name,
|
||||||
CommandData const & commandData,
|
CommandData const & commandData,
|
||||||
size_t initialSkipCount,
|
size_t initialSkipCount,
|
||||||
@ -4139,7 +4102,7 @@ std::string VulkanHppGenerator::generateCommandResultMultiSuccessNoErrors( std::
|
|||||||
if ( constPointerParams.empty() )
|
if ( constPointerParams.empty() )
|
||||||
{
|
{
|
||||||
return generateCommandSetStandardOrEnhanced( generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
return generateCommandSetStandardOrEnhanced( generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
||||||
generateCommandResult( name, commandData, initialSkipCount, definition, {} ) );
|
generateCommandResult( name, commandData, initialSkipCount, definition, {}, {}, false ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -4178,7 +4141,7 @@ std::string VulkanHppGenerator::generateCommandResultMultiSuccessWithErrors1Retu
|
|||||||
definition,
|
definition,
|
||||||
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
||||||
generateCommandResultGetVector( name, commandData, initialSkipCount, definition, vectorParams, returnParam ),
|
generateCommandResultGetVector( name, commandData, initialSkipCount, definition, vectorParams, returnParam ),
|
||||||
generateCommandResultGetValue( name, commandData, initialSkipCount, definition, vectorParams, returnParam, true ) );
|
generateCommandResult( name, commandData, initialSkipCount, definition, vectorParams, { returnParam }, true ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -4201,7 +4164,7 @@ std::string VulkanHppGenerator::generateCommandResultMultiSuccessWithErrors1Retu
|
|||||||
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
||||||
generateCommandResultGetVectorOfHandlesOrValues( name, commandData, initialSkipCount, definition, vectorParams, returnParam, false ),
|
generateCommandResultGetVectorOfHandlesOrValues( name, commandData, initialSkipCount, definition, vectorParams, returnParam, false ),
|
||||||
generateCommandResultGetVectorOfHandlesOrValues( name, commandData, initialSkipCount, definition, vectorParams, returnParam, true ),
|
generateCommandResultGetVectorOfHandlesOrValues( name, commandData, initialSkipCount, definition, vectorParams, returnParam, true ),
|
||||||
generateCommandResultGetValue( name, commandData, initialSkipCount, definition, vectorParams, returnParam, true ),
|
generateCommandResult( name, commandData, initialSkipCount, definition, vectorParams, { returnParam }, true ),
|
||||||
generateCommandResultGetVectorOfHandlesUnique( name, commandData, initialSkipCount, definition, vectorParams, returnParam, false ),
|
generateCommandResultGetVectorOfHandlesUnique( name, commandData, initialSkipCount, definition, vectorParams, returnParam, false ),
|
||||||
generateCommandResultGetVectorOfHandlesUnique( name, commandData, initialSkipCount, definition, vectorParams, returnParam, true ),
|
generateCommandResultGetVectorOfHandlesUnique( name, commandData, initialSkipCount, definition, vectorParams, returnParam, true ),
|
||||||
generateCommandResultGetVectorOfHandlesUniqueSingular( name, commandData, initialSkipCount, definition, vectorParams, returnParam ) );
|
generateCommandResultGetVectorOfHandlesUniqueSingular( name, commandData, initialSkipCount, definition, vectorParams, returnParam ) );
|
||||||
@ -4219,7 +4182,7 @@ std::string VulkanHppGenerator::generateCommandResultMultiSuccessWithErrors1Retu
|
|||||||
return generateCommandSetStandardEnhanced(
|
return generateCommandSetStandardEnhanced(
|
||||||
definition,
|
definition,
|
||||||
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
||||||
generateCommandResultGetValue( name, commandData, initialSkipCount, definition, vectorParams, returnParam, false ) );
|
generateCommandResult( name, commandData, initialSkipCount, definition, vectorParams, { returnParam }, false ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
@ -4328,7 +4291,7 @@ std::string VulkanHppGenerator::generateCommandResultSingleSuccessNoErrors( std:
|
|||||||
if ( constPointerParams.empty() )
|
if ( constPointerParams.empty() )
|
||||||
{
|
{
|
||||||
return generateCommandSetStandardOrEnhanced( generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
return generateCommandSetStandardOrEnhanced( generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
||||||
generateCommandResult( name, commandData, initialSkipCount, definition, {} ) );
|
generateCommandResult( name, commandData, initialSkipCount, definition, {}, {}, false ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ( vectorParams.size() == 1 )
|
else if ( vectorParams.size() == 1 )
|
||||||
@ -4339,7 +4302,7 @@ std::string VulkanHppGenerator::generateCommandResultSingleSuccessNoErrors( std:
|
|||||||
{
|
{
|
||||||
return generateCommandSetStandardEnhanced( definition,
|
return generateCommandSetStandardEnhanced( definition,
|
||||||
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
||||||
generateCommandResult( name, commandData, initialSkipCount, definition, vectorParams ) );
|
generateCommandResult( name, commandData, initialSkipCount, definition, vectorParams, {}, false ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -4392,7 +4355,7 @@ std::string VulkanHppGenerator::generateCommandResultSingleSuccessWithErrors1Ret
|
|||||||
return generateCommandSetStandardEnhancedChained(
|
return generateCommandSetStandardEnhancedChained(
|
||||||
definition,
|
definition,
|
||||||
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
||||||
generateCommandResultGetValue( name, commandData, initialSkipCount, definition, vectorParams, returnParam, false ),
|
generateCommandResult( name, commandData, initialSkipCount, definition, vectorParams, { returnParam }, false ),
|
||||||
generateCommandResultGetChain( name, commandData, initialSkipCount, definition, returnParam ) );
|
generateCommandResultGetChain( name, commandData, initialSkipCount, definition, returnParam ) );
|
||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
@ -4408,7 +4371,7 @@ std::string VulkanHppGenerator::generateCommandResultSingleSuccessWithErrors1Ret
|
|||||||
return generateCommandSetStandardEnhancedUnique(
|
return generateCommandSetStandardEnhancedUnique(
|
||||||
definition,
|
definition,
|
||||||
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
||||||
generateCommandResultGetValue( name, commandData, initialSkipCount, definition, vectorParams, returnParam, false ),
|
generateCommandResult( name, commandData, initialSkipCount, definition, vectorParams, { returnParam }, false ),
|
||||||
generateCommandResultGetHandleUnique( name, commandData, initialSkipCount, definition, returnParam ) );
|
generateCommandResultGetHandleUnique( name, commandData, initialSkipCount, definition, returnParam ) );
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
@ -4465,7 +4428,7 @@ std::string VulkanHppGenerator::generateCommandResultSingleSuccessWithErrors1Ret
|
|||||||
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
||||||
generateCommandResultGetVectorOfHandlesOrValues( name, commandData, initialSkipCount, definition, vectorParams, returnParam, false ),
|
generateCommandResultGetVectorOfHandlesOrValues( name, commandData, initialSkipCount, definition, vectorParams, returnParam, false ),
|
||||||
generateCommandResultGetVectorOfHandlesOrValues( name, commandData, initialSkipCount, definition, vectorParams, returnParam, true ),
|
generateCommandResultGetVectorOfHandlesOrValues( name, commandData, initialSkipCount, definition, vectorParams, returnParam, true ),
|
||||||
generateCommandResultGetValue( name, commandData, initialSkipCount, definition, vectorParams, returnParam, true ),
|
generateCommandResult( name, commandData, initialSkipCount, definition, vectorParams, { returnParam }, true ),
|
||||||
generateCommandResultGetVectorOfHandlesUnique( name, commandData, initialSkipCount, definition, vectorParams, returnParam, false ),
|
generateCommandResultGetVectorOfHandlesUnique( name, commandData, initialSkipCount, definition, vectorParams, returnParam, false ),
|
||||||
generateCommandResultGetVectorOfHandlesUnique( name, commandData, initialSkipCount, definition, vectorParams, returnParam, true ),
|
generateCommandResultGetVectorOfHandlesUnique( name, commandData, initialSkipCount, definition, vectorParams, returnParam, true ),
|
||||||
generateCommandResultGetVectorOfHandlesUniqueSingular( name, commandData, initialSkipCount, definition, vectorParams, returnParam ) );
|
generateCommandResultGetVectorOfHandlesUniqueSingular( name, commandData, initialSkipCount, definition, vectorParams, returnParam ) );
|
||||||
@ -4486,7 +4449,7 @@ std::string VulkanHppGenerator::generateCommandResultSingleSuccessWithErrors1Ret
|
|||||||
return generateCommandSetStandardEnhanced(
|
return generateCommandSetStandardEnhanced(
|
||||||
definition,
|
definition,
|
||||||
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
||||||
generateCommandResultGetValue( name, commandData, initialSkipCount, definition, vectorParams, returnParam, false ) );
|
generateCommandResult( name, commandData, initialSkipCount, definition, vectorParams, { returnParam }, false ) );
|
||||||
case 2:
|
case 2:
|
||||||
return generateCommandResultSingleSuccessWithErrors1ReturnValue2Vectors( name, commandData, initialSkipCount, definition, returnParam, vectorParams );
|
return generateCommandResultSingleSuccessWithErrors1ReturnValue2Vectors( name, commandData, initialSkipCount, definition, returnParam, vectorParams );
|
||||||
break;
|
break;
|
||||||
@ -4516,7 +4479,7 @@ std::string VulkanHppGenerator::generateCommandResultSingleSuccessWithErrors1Ret
|
|||||||
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
||||||
generateCommandResultGetVectorOfHandlesOrValues( name, commandData, initialSkipCount, definition, vectorParams, returnParam, false ),
|
generateCommandResultGetVectorOfHandlesOrValues( name, commandData, initialSkipCount, definition, vectorParams, returnParam, false ),
|
||||||
generateCommandResultGetVectorOfHandlesOrValues( name, commandData, initialSkipCount, definition, vectorParams, returnParam, true ),
|
generateCommandResultGetVectorOfHandlesOrValues( name, commandData, initialSkipCount, definition, vectorParams, returnParam, true ),
|
||||||
generateCommandResultGetValue( name, commandData, initialSkipCount, definition, vectorParams, returnParam, true ) );
|
generateCommandResult( name, commandData, initialSkipCount, definition, vectorParams, { returnParam }, true ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -4534,7 +4497,7 @@ std::string VulkanHppGenerator::generateCommandResultSingleSuccessWithErrors1Ret
|
|||||||
return generateCommandSetStandardEnhanced(
|
return generateCommandSetStandardEnhanced(
|
||||||
definition,
|
definition,
|
||||||
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
||||||
generateCommandResultGetValue( name, commandData, initialSkipCount, definition, vectorParams, returnParam, false ) );
|
generateCommandResult( name, commandData, initialSkipCount, definition, vectorParams, { returnParam }, false ) );
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
if ( returnParam == vectorParams.begin()->first )
|
if ( returnParam == vectorParams.begin()->first )
|
||||||
@ -4545,7 +4508,7 @@ std::string VulkanHppGenerator::generateCommandResultSingleSuccessWithErrors1Ret
|
|||||||
definition,
|
definition,
|
||||||
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
||||||
generateCommandResultGetVector( name, commandData, initialSkipCount, definition, vectorParams, returnParam ),
|
generateCommandResultGetVector( name, commandData, initialSkipCount, definition, vectorParams, returnParam ),
|
||||||
generateCommandResultGetValue( name, commandData, initialSkipCount, definition, vectorParams, returnParam, true ) );
|
generateCommandResult( name, commandData, initialSkipCount, definition, vectorParams, { returnParam }, true ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -4564,7 +4527,7 @@ std::string VulkanHppGenerator::generateCommandResultSingleSuccessWithErrors1Ret
|
|||||||
definition,
|
definition,
|
||||||
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
||||||
generateCommandResultGetVector( name, commandData, initialSkipCount, definition, vectorParams, returnParam ),
|
generateCommandResultGetVector( name, commandData, initialSkipCount, definition, vectorParams, returnParam ),
|
||||||
generateCommandResultGetValue( name, commandData, initialSkipCount, definition, vectorParams, returnParam, true ) );
|
generateCommandResult( name, commandData, initialSkipCount, definition, vectorParams, { returnParam }, true ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -4626,13 +4589,13 @@ std::string VulkanHppGenerator::generateCommandResultWithErrors0Return( std::str
|
|||||||
if ( vectorParams.empty() && determineConstPointerParams( commandData.params ).empty() )
|
if ( vectorParams.empty() && determineConstPointerParams( commandData.params ).empty() )
|
||||||
{
|
{
|
||||||
return generateCommandSetStandardOrEnhanced( generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
return generateCommandSetStandardOrEnhanced( generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
||||||
generateCommandResult( name, commandData, initialSkipCount, definition, vectorParams ) );
|
generateCommandResult( name, commandData, initialSkipCount, definition, vectorParams, {}, false ) );
|
||||||
}
|
}
|
||||||
else if ( allVectorSizesSupported( commandData.params, vectorParams ) )
|
else if ( allVectorSizesSupported( commandData.params, vectorParams ) )
|
||||||
{
|
{
|
||||||
return generateCommandSetStandardEnhanced( definition,
|
return generateCommandSetStandardEnhanced( definition,
|
||||||
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
generateCommandStandard( name, commandData, initialSkipCount, definition ),
|
||||||
generateCommandResult( name, commandData, initialSkipCount, definition, vectorParams ) );
|
generateCommandResult( name, commandData, initialSkipCount, definition, vectorParams, {}, false ) );
|
||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
@ -4887,7 +4850,9 @@ std::string VulkanHppGenerator::generateCommandSingle(
|
|||||||
R"( template <${argumentTemplates}${chainTemplates}typename Dispatch>
|
R"( template <${argumentTemplates}${chainTemplates}typename Dispatch>
|
||||||
${nodiscard}VULKAN_HPP_INLINE ${returnType} ${className}${classSeparator}${commandName}( ${argumentList} )${const}${noexcept}
|
${nodiscard}VULKAN_HPP_INLINE ${returnType} ${className}${classSeparator}${commandName}( ${argumentList} )${const}${noexcept}
|
||||||
{
|
{
|
||||||
VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );${vectorSizeCheck}
|
VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
|
||||||
|
${vectorSizeCheck}
|
||||||
|
${dataDeclarations}
|
||||||
${return}d.${vkCommand}( ${callArguments} );
|
${return}d.${vkCommand}( ${callArguments} );
|
||||||
})";
|
})";
|
||||||
|
|
||||||
@ -4901,12 +4866,13 @@ std::string VulkanHppGenerator::generateCommandSingle(
|
|||||||
{ "classSeparator", commandData.handle.empty() ? "" : "::" },
|
{ "classSeparator", commandData.handle.empty() ? "" : "::" },
|
||||||
{ "commandName", commandName },
|
{ "commandName", commandName },
|
||||||
{ "const", commandData.handle.empty() ? "" : " const" },
|
{ "const", commandData.handle.empty() ? "" : " const" },
|
||||||
|
{ "dataDeclarations", "" },
|
||||||
{ "nodiscard", nodiscard },
|
{ "nodiscard", nodiscard },
|
||||||
{ "noexcept", noexceptString },
|
{ "noexcept", noexceptString },
|
||||||
{ "return", returnCall },
|
{ "return", returnCall },
|
||||||
{ "returnType", returnType },
|
{ "returnType", returnType },
|
||||||
{ "vectorSizeCheck",
|
{ "vectorSizeCheck",
|
||||||
vectorSizeCheck.first ? generateVectorSizeCheck( name, commandData, initialSkipCount, vectorSizeCheck.second, skippedParams ) : "" },
|
vectorSizeCheck.first ? generateVectorSizeCheck( name, commandData, initialSkipCount, vectorSizeCheck.second, skippedParams, false ) : "" },
|
||||||
{ "vkCommand", name } } );
|
{ "vkCommand", name } } );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -5329,24 +5295,25 @@ std::string VulkanHppGenerator::generateCommandVoidGetValue( std::string const &
|
|||||||
|
|
||||||
if ( definition )
|
if ( definition )
|
||||||
{
|
{
|
||||||
std::string chainData, returnVariable;
|
std::string dataDeclarations, returnVariable;
|
||||||
if ( chained )
|
if ( chained )
|
||||||
{
|
{
|
||||||
returnVariable = "structureChain";
|
std::string dataDeclarationsTemplate = R"(${returnType} ${returnVariable};
|
||||||
|
|
||||||
std::string const chainDataTemplate = R"(
|
|
||||||
${dataType} & ${dataVariable} = ${returnVariable}.template get<${dataType}>();)";
|
${dataType} & ${dataVariable} = ${returnVariable}.template get<${dataType}>();)";
|
||||||
|
|
||||||
chainData = replaceWithMap( chainDataTemplate,
|
returnVariable = "structureChain";
|
||||||
{
|
dataDeclarations = replaceWithMap( dataDeclarationsTemplate,
|
||||||
{ "dataType", stripPostfix( commandData.params[returnParam].type.compose( "VULKAN_HPP_NAMESPACE" ), " *" ) },
|
{ { "dataType", stripPostfix( commandData.params[returnParam].type.compose( "VULKAN_HPP_NAMESPACE" ), " *" ) },
|
||||||
{ "dataVariable", startLowerCase( stripPrefix( commandData.params[returnParam].name, "p" ) ) },
|
{ "dataVariable", startLowerCase( stripPrefix( commandData.params[returnParam].name, "p" ) ) },
|
||||||
{ "returnVariable", returnVariable },
|
{ "returnType", returnType },
|
||||||
} );
|
{ "returnVariable", returnVariable } } );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
std::string dataDeclarationsTemplate = R"(${returnType} ${returnVariable};)";
|
||||||
|
|
||||||
returnVariable = startLowerCase( stripPrefix( commandData.params[returnParam].name, "p" ) );
|
returnVariable = startLowerCase( stripPrefix( commandData.params[returnParam].name, "p" ) );
|
||||||
|
dataDeclarations = replaceWithMap( dataDeclarationsTemplate, { { "returnType", returnType }, { "returnVariable", returnVariable } } );
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string className = initialSkipCount ? stripPrefix( commandData.params[initialSkipCount - 1].type.type, "Vk" ) : "";
|
std::string className = initialSkipCount ? stripPrefix( commandData.params[initialSkipCount - 1].type.type, "Vk" ) : "";
|
||||||
@ -5355,15 +5322,16 @@ std::string VulkanHppGenerator::generateCommandVoidGetValue( std::string const &
|
|||||||
std::string vectorSizeCheckString;
|
std::string vectorSizeCheckString;
|
||||||
if ( vectorSizeCheck.first )
|
if ( vectorSizeCheck.first )
|
||||||
{
|
{
|
||||||
vectorSizeCheckString = generateVectorSizeCheck( name, commandData, initialSkipCount, vectorSizeCheck.second, skippedParams );
|
vectorSizeCheckString = generateVectorSizeCheck( name, commandData, initialSkipCount, vectorSizeCheck.second, skippedParams, false );
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string const functionTemplate =
|
std::string const functionTemplate =
|
||||||
R"( template <${argumentTemplates}${chainTemplates}typename Dispatch>
|
R"( template <${argumentTemplates}${chainTemplates}typename Dispatch>
|
||||||
${nodiscard}VULKAN_HPP_INLINE ${returnType} ${className}${classSeparator}${commandName}( ${argumentList} )${const}${noexcept}
|
${nodiscard}VULKAN_HPP_INLINE ${returnType} ${className}${classSeparator}${commandName}( ${argumentList} )${const}${noexcept}
|
||||||
{
|
{
|
||||||
VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );${vectorSizeCheck}
|
VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
|
||||||
${returnType} ${returnVariable};${chainData}
|
${vectorSizeCheck}
|
||||||
|
${dataDeclarations}
|
||||||
d.${vkCommand}( ${callArguments} );
|
d.${vkCommand}( ${callArguments} );
|
||||||
return ${returnVariable};
|
return ${returnVariable};
|
||||||
})";
|
})";
|
||||||
@ -5372,12 +5340,12 @@ std::string VulkanHppGenerator::generateCommandVoidGetValue( std::string const &
|
|||||||
{ { "argumentList", argumentList },
|
{ { "argumentList", argumentList },
|
||||||
{ "argumentTemplates", argumentTemplates },
|
{ "argumentTemplates", argumentTemplates },
|
||||||
{ "callArguments", generateCallArgumentsEnhanced( commandData, initialSkipCount, false, {}, templatedParams, false ) },
|
{ "callArguments", generateCallArgumentsEnhanced( commandData, initialSkipCount, false, {}, templatedParams, false ) },
|
||||||
{ "chainData", chainData },
|
|
||||||
{ "chainTemplates", chainTemplates },
|
{ "chainTemplates", chainTemplates },
|
||||||
{ "className", className },
|
{ "className", className },
|
||||||
{ "classSeparator", classSeparator },
|
{ "classSeparator", classSeparator },
|
||||||
{ "commandName", commandName },
|
{ "commandName", commandName },
|
||||||
{ "const", commandData.handle.empty() ? "" : " const" },
|
{ "const", commandData.handle.empty() ? "" : " const" },
|
||||||
|
{ "dataDeclarations", dataDeclarations },
|
||||||
{ "nodiscard", "VULKAN_HPP_NODISCARD " },
|
{ "nodiscard", "VULKAN_HPP_NODISCARD " },
|
||||||
{ "noexcept", noexceptString },
|
{ "noexcept", noexceptString },
|
||||||
{ "returnType", returnType },
|
{ "returnType", returnType },
|
||||||
@ -6679,7 +6647,8 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultMultiSuccessNoErr
|
|||||||
std::string const definitionTemplate =
|
std::string const definitionTemplate =
|
||||||
R"(
|
R"(
|
||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT
|
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT
|
||||||
{${functionPointerCheck}${vectorSizeCheck}
|
{${functionPointerCheck}
|
||||||
|
${vectorSizeCheck}
|
||||||
return static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->${vkCommand}( ${callArguments} ) );
|
return static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->${vkCommand}( ${callArguments} ) );
|
||||||
}
|
}
|
||||||
)";
|
)";
|
||||||
@ -6748,7 +6717,8 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultMultiSuccessWithE
|
|||||||
std::string const definitionTemplate =
|
std::string const definitionTemplate =
|
||||||
R"(${argumentTemplates}
|
R"(${argumentTemplates}
|
||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result ${className}::${commandName}( ${argumentList} ) const
|
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result ${className}::${commandName}( ${argumentList} ) const
|
||||||
{${functionPointerCheck}${vectorSizeCheck}
|
{${functionPointerCheck}
|
||||||
|
${vectorSizeCheck}
|
||||||
VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->${vkCommand}( ${callArguments} ) );
|
VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->${vkCommand}( ${callArguments} ) );
|
||||||
if ( ${failureCheck} )
|
if ( ${failureCheck} )
|
||||||
{
|
{
|
||||||
@ -7409,7 +7379,8 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultSingleSuccessNoEr
|
|||||||
std::string const definitionTemplate =
|
std::string const definitionTemplate =
|
||||||
R"(
|
R"(
|
||||||
VULKAN_HPP_INLINE void ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT
|
VULKAN_HPP_INLINE void ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT
|
||||||
{${functionPointerCheck}${vectorSizeCheck}
|
{${functionPointerCheck}
|
||||||
|
${vectorSizeCheck}
|
||||||
getDispatcher()->${vkCommand}( ${callArguments} );
|
getDispatcher()->${vkCommand}( ${callArguments} );
|
||||||
}
|
}
|
||||||
)";
|
)";
|
||||||
@ -7478,7 +7449,8 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultSingleSuccessWith
|
|||||||
std::string const definitionTemplate =
|
std::string const definitionTemplate =
|
||||||
R"(${argumentTemplates}
|
R"(${argumentTemplates}
|
||||||
VULKAN_HPP_INLINE void ${className}::${commandName}( ${argumentList} ) const
|
VULKAN_HPP_INLINE void ${className}::${commandName}( ${argumentList} ) const
|
||||||
{${functionPointerCheck}${vectorSizeCheck}
|
{${functionPointerCheck}
|
||||||
|
${vectorSizeCheck}
|
||||||
VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->${vkCommand}( ${callArguments} ) );
|
VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->${vkCommand}( ${callArguments} ) );
|
||||||
if ( ${failureCheck} )
|
if ( ${failureCheck} )
|
||||||
{
|
{
|
||||||
@ -8203,7 +8175,8 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandValue0Return0VectorType
|
|||||||
std::string const definitionTemplate =
|
std::string const definitionTemplate =
|
||||||
R"(${argumentTemplates}
|
R"(${argumentTemplates}
|
||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ${returnType} ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT
|
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ${returnType} ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT
|
||||||
{${functionPointerCheck}${vectorSizeCheck}
|
{${functionPointerCheck}
|
||||||
|
${vectorSizeCheck}
|
||||||
return getDispatcher()->${vkCommand}( ${callArguments} );
|
return getDispatcher()->${vkCommand}( ${callArguments} );
|
||||||
}
|
}
|
||||||
)";
|
)";
|
||||||
@ -8211,7 +8184,8 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandValue0Return0VectorType
|
|||||||
std::string callArguments = generateCallArgumentsEnhanced( commandIt->second, initialSkipCount, false, {}, templatedParams, true );
|
std::string callArguments = generateCallArgumentsEnhanced( commandIt->second, initialSkipCount, false, {}, templatedParams, true );
|
||||||
std::pair<bool, std::map<size_t, std::vector<size_t>>> vectorSizeCheck = needsVectorSizeCheck( commandIt->second.params, vectorParams, {} );
|
std::pair<bool, std::map<size_t, std::vector<size_t>>> vectorSizeCheck = needsVectorSizeCheck( commandIt->second.params, vectorParams, {} );
|
||||||
std::string vectorSizeCheckString =
|
std::string vectorSizeCheckString =
|
||||||
vectorSizeCheck.first ? generateVectorSizeCheck( commandIt->first, commandIt->second, initialSkipCount, vectorSizeCheck.second, skippedParams ) : "";
|
vectorSizeCheck.first ? generateVectorSizeCheck( commandIt->first, commandIt->second, initialSkipCount, vectorSizeCheck.second, skippedParams, true )
|
||||||
|
: "";
|
||||||
|
|
||||||
return replaceWithMap( definitionTemplate,
|
return replaceWithMap( definitionTemplate,
|
||||||
{ { "argumentList", argumentList },
|
{ { "argumentList", argumentList },
|
||||||
@ -8256,7 +8230,8 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandValue0Return0VectorVkTy
|
|||||||
std::string const definitionTemplate =
|
std::string const definitionTemplate =
|
||||||
R"(
|
R"(
|
||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ${returnType} ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT
|
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ${returnType} ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT
|
||||||
{${functionPointerCheck}${vectorSizeCheck}
|
{${functionPointerCheck}
|
||||||
|
${vectorSizeCheck}
|
||||||
return static_cast<${returnType}>( getDispatcher()->${vkCommand}( ${callArguments} ) );
|
return static_cast<${returnType}>( getDispatcher()->${vkCommand}( ${callArguments} ) );
|
||||||
}
|
}
|
||||||
)";
|
)";
|
||||||
@ -8371,7 +8346,7 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandVoid0Return( std::map<s
|
|||||||
std::string argumentList = generateArgumentListEnhanced( commandIt->second.params, skippedParams, {}, templatedParams, definition, false, false, false );
|
std::string argumentList = generateArgumentListEnhanced( commandIt->second.params, skippedParams, {}, templatedParams, definition, false, false, false );
|
||||||
std::string commandName = generateCommandName( commandIt->first, commandIt->second.params, initialSkipCount, m_tags );
|
std::string commandName = generateCommandName( commandIt->first, commandIt->second.params, initialSkipCount, m_tags );
|
||||||
std::pair<bool, std::map<size_t, std::vector<size_t>>> vectorSizeCheck = needsVectorSizeCheck( commandIt->second.params, vectorParams, {} );
|
std::pair<bool, std::map<size_t, std::vector<size_t>>> vectorSizeCheck = needsVectorSizeCheck( commandIt->second.params, vectorParams, {} );
|
||||||
std::string noexceptString = vectorSizeCheck.first ? "VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS" : "VULKAN_HPP_NOEXCEPT";
|
std::string noexceptString = vectorSizeCheck.first ? "" : "VULKAN_HPP_NOEXCEPT";
|
||||||
std::string argumentTemplates = generateArgumentTemplates( commandIt->second.params, templatedParams, true );
|
std::string argumentTemplates = generateArgumentTemplates( commandIt->second.params, templatedParams, true );
|
||||||
|
|
||||||
if ( definition )
|
if ( definition )
|
||||||
@ -8379,14 +8354,16 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandVoid0Return( std::map<s
|
|||||||
std::string const definitionTemplate =
|
std::string const definitionTemplate =
|
||||||
R"(${argumentTemplates}
|
R"(${argumentTemplates}
|
||||||
VULKAN_HPP_INLINE void ${className}::${commandName}( ${argumentList} ) const ${noexcept}
|
VULKAN_HPP_INLINE void ${className}::${commandName}( ${argumentList} ) const ${noexcept}
|
||||||
{${functionPointerCheck}${vectorSizeCheck}
|
{${functionPointerCheck}
|
||||||
|
${vectorSizeCheck}
|
||||||
getDispatcher()->${vkCommand}( ${callArguments} );
|
getDispatcher()->${vkCommand}( ${callArguments} );
|
||||||
}
|
}
|
||||||
)";
|
)";
|
||||||
|
|
||||||
std::string callArguments = generateCallArgumentsEnhanced( commandIt->second, initialSkipCount, false, {}, templatedParams, true );
|
std::string callArguments = generateCallArgumentsEnhanced( commandIt->second, initialSkipCount, false, {}, templatedParams, true );
|
||||||
std::string vectorSizeCheckString =
|
std::string vectorSizeCheckString =
|
||||||
vectorSizeCheck.first ? generateVectorSizeCheck( commandIt->first, commandIt->second, initialSkipCount, vectorSizeCheck.second, skippedParams ) : "";
|
vectorSizeCheck.first ? generateVectorSizeCheck( commandIt->first, commandIt->second, initialSkipCount, vectorSizeCheck.second, skippedParams, true )
|
||||||
|
: "";
|
||||||
|
|
||||||
return replaceWithMap( definitionTemplate,
|
return replaceWithMap( definitionTemplate,
|
||||||
{ { "argumentList", argumentList },
|
{ { "argumentList", argumentList },
|
||||||
@ -8477,14 +8454,15 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandVoid1ReturnValue( std::
|
|||||||
std::string commandName = generateCommandName( commandIt->first, commandIt->second.params, initialSkipCount, m_tags );
|
std::string commandName = generateCommandName( commandIt->first, commandIt->second.params, initialSkipCount, m_tags );
|
||||||
std::string returnType = stripPostfix( commandIt->second.params[returnParam].type.compose( "VULKAN_HPP_NAMESPACE" ), "*" );
|
std::string returnType = stripPostfix( commandIt->second.params[returnParam].type.compose( "VULKAN_HPP_NAMESPACE" ), "*" );
|
||||||
std::pair<bool, std::map<size_t, std::vector<size_t>>> vectorSizeCheck = needsVectorSizeCheck( commandIt->second.params, vectorParams, {} );
|
std::pair<bool, std::map<size_t, std::vector<size_t>>> vectorSizeCheck = needsVectorSizeCheck( commandIt->second.params, vectorParams, {} );
|
||||||
std::string noexceptString = vectorSizeCheck.first ? "VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS" : "VULKAN_HPP_NOEXCEPT";
|
std::string noexceptString = vectorSizeCheck.first ? "" : "VULKAN_HPP_NOEXCEPT";
|
||||||
|
|
||||||
if ( definition )
|
if ( definition )
|
||||||
{
|
{
|
||||||
std::string const definitionTemplate =
|
std::string const definitionTemplate =
|
||||||
R"(
|
R"(
|
||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ${returnType} ${className}::${commandName}( ${argumentList} ) const ${noexcept}
|
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ${returnType} ${className}::${commandName}( ${argumentList} ) const ${noexcept}
|
||||||
{${functionPointerCheck}${vectorSizeCheck}
|
{${functionPointerCheck}
|
||||||
|
${vectorSizeCheck}
|
||||||
${returnType} ${returnVariable};
|
${returnType} ${returnVariable};
|
||||||
getDispatcher()->${vkCommand}( ${callArguments} );
|
getDispatcher()->${vkCommand}( ${callArguments} );
|
||||||
return ${returnVariable};
|
return ${returnVariable};
|
||||||
@ -8500,7 +8478,7 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandVoid1ReturnValue( std::
|
|||||||
{ "functionPointerCheck", generateFunctionPointerCheck( commandIt->first, commandIt->second.referencedIn ) },
|
{ "functionPointerCheck", generateFunctionPointerCheck( commandIt->first, commandIt->second.referencedIn ) },
|
||||||
{ "noexcept", noexceptString },
|
{ "noexcept", noexceptString },
|
||||||
{ "vectorSizeCheck",
|
{ "vectorSizeCheck",
|
||||||
vectorSizeCheck.first ? generateVectorSizeCheck( commandIt->first, commandIt->second, initialSkipCount, vectorSizeCheck.second, skippedParams )
|
vectorSizeCheck.first ? generateVectorSizeCheck( commandIt->first, commandIt->second, initialSkipCount, vectorSizeCheck.second, skippedParams, true )
|
||||||
: "" },
|
: "" },
|
||||||
{ "returnType", returnType },
|
{ "returnType", returnType },
|
||||||
{ "returnVariable", startLowerCase( stripPrefix( commandIt->second.params[returnParam].name, "p" ) ) },
|
{ "returnVariable", startLowerCase( stripPrefix( commandIt->second.params[returnParam].name, "p" ) ) },
|
||||||
@ -11113,7 +11091,8 @@ std::string VulkanHppGenerator::generateVectorSizeCheck( std::string const &
|
|||||||
CommandData const & commandData,
|
CommandData const & commandData,
|
||||||
size_t initialSkipCount,
|
size_t initialSkipCount,
|
||||||
std::map<size_t, std::vector<size_t>> const & countToVectorMap,
|
std::map<size_t, std::vector<size_t>> const & countToVectorMap,
|
||||||
std::set<size_t> const & skippedParams ) const
|
std::set<size_t> const & skippedParams,
|
||||||
|
bool onlyThrows ) const
|
||||||
{
|
{
|
||||||
std::string const assertTemplate = " VULKAN_HPP_ASSERT( ${zeroSizeCheck}${firstVectorName}.size() == ${secondVectorName}.size() );";
|
std::string const assertTemplate = " VULKAN_HPP_ASSERT( ${zeroSizeCheck}${firstVectorName}.size() == ${secondVectorName}.size() );";
|
||||||
std::string const assertTemplateVoid =
|
std::string const assertTemplateVoid =
|
||||||
@ -11203,15 +11182,13 @@ std::string VulkanHppGenerator::generateVectorSizeCheck( std::string const &
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::string const sizeCheckTemplate =
|
std::string const sizeCheckTemplate =
|
||||||
R"#(
|
R"(#ifdef VULKAN_HPP_NO_EXCEPTIONS
|
||||||
#ifdef VULKAN_HPP_NO_EXCEPTIONS
|
|
||||||
${assertions}
|
${assertions}
|
||||||
#else
|
#else
|
||||||
${throws}
|
${throws}
|
||||||
#endif /*VULKAN_HPP_NO_EXCEPTIONS*/
|
#endif /*VULKAN_HPP_NO_EXCEPTIONS*/)";
|
||||||
)#";
|
|
||||||
|
|
||||||
return replaceWithMap( sizeCheckTemplate, { { "assertions", assertions }, { "throws", throws } } );
|
return onlyThrows ? throws : replaceWithMap( sizeCheckTemplate, { { "assertions", assertions }, { "throws", throws } } );
|
||||||
}
|
}
|
||||||
|
|
||||||
std::pair<std::string, std::string> VulkanHppGenerator::getParentTypeAndName( std::pair<std::string, HandleData> const & handle ) const
|
std::pair<std::string, std::string> VulkanHppGenerator::getParentTypeAndName( std::pair<std::string, HandleData> const & handle ) const
|
||||||
|
@ -462,7 +462,9 @@ private:
|
|||||||
CommandData const & commandData,
|
CommandData const & commandData,
|
||||||
size_t initialSkipCount,
|
size_t initialSkipCount,
|
||||||
bool definition,
|
bool definition,
|
||||||
std::map<size_t, size_t> const & vectorParamIndices ) const;
|
std::map<size_t, size_t> const & vectorParamIndices,
|
||||||
|
std::vector<size_t> const & returnParams,
|
||||||
|
bool singular ) const;
|
||||||
std::string generateCommandResultEnumerate( std::string const & name,
|
std::string generateCommandResultEnumerate( std::string const & name,
|
||||||
CommandData const & commandData,
|
CommandData const & commandData,
|
||||||
size_t initialSkipCount,
|
size_t initialSkipCount,
|
||||||
@ -492,13 +494,6 @@ private:
|
|||||||
bool definition,
|
bool definition,
|
||||||
std::vector<size_t> const & returnParamIndices,
|
std::vector<size_t> const & returnParamIndices,
|
||||||
std::map<size_t, size_t> const & vectorParamIndices ) const;
|
std::map<size_t, size_t> const & vectorParamIndices ) const;
|
||||||
std::string generateCommandResultGetValue( std::string const & name,
|
|
||||||
CommandData const & commandData,
|
|
||||||
size_t initialSkipCount,
|
|
||||||
bool definition,
|
|
||||||
std::map<size_t, size_t> const & vectorParams,
|
|
||||||
size_t returnParam,
|
|
||||||
bool singular ) const;
|
|
||||||
std::string generateCommandResultGetVector( std::string const & name,
|
std::string generateCommandResultGetVector( std::string const & name,
|
||||||
CommandData const & commandData,
|
CommandData const & commandData,
|
||||||
size_t initialSkipCount,
|
size_t initialSkipCount,
|
||||||
@ -957,7 +952,8 @@ private:
|
|||||||
CommandData const & commandData,
|
CommandData const & commandData,
|
||||||
size_t initialSkipCount,
|
size_t initialSkipCount,
|
||||||
std::map<size_t, std::vector<size_t>> const & countToVectorMap,
|
std::map<size_t, std::vector<size_t>> const & countToVectorMap,
|
||||||
std::set<size_t> const & skippedParams ) const;
|
std::set<size_t> const & skippedParams,
|
||||||
|
bool onlyThrows ) const;
|
||||||
std::pair<std::string, std::string> getParentTypeAndName( std::pair<std::string, HandleData> const & handle ) const;
|
std::pair<std::string, std::string> getParentTypeAndName( std::pair<std::string, HandleData> const & handle ) const;
|
||||||
std::string getPlatform( std::string const & title ) const;
|
std::string getPlatform( std::string const & title ) const;
|
||||||
std::pair<std::string, std::string> getPoolTypeAndName( std::string const & type ) const;
|
std::pair<std::string, std::string> getPoolTypeAndName( std::string const & type ) const;
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -3406,7 +3406,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
//=== VK_EXT_hdr_metadata ===
|
//=== VK_EXT_hdr_metadata ===
|
||||||
|
|
||||||
void setHdrMetadataEXT( ArrayProxy<const VULKAN_HPP_NAMESPACE::SwapchainKHR> const & swapchains,
|
void setHdrMetadataEXT( ArrayProxy<const VULKAN_HPP_NAMESPACE::SwapchainKHR> const & swapchains,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::HdrMetadataEXT> const & metadata ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::HdrMetadataEXT> const & metadata ) const;
|
||||||
|
|
||||||
//=== VK_KHR_create_renderpass2 ===
|
//=== VK_KHR_create_renderpass2 ===
|
||||||
|
|
||||||
@ -3514,10 +3514,10 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::AccelerationStructureCompatibilityKHR
|
VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::AccelerationStructureCompatibilityKHR
|
||||||
getAccelerationStructureCompatibilityKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureVersionInfoKHR & versionInfo ) const VULKAN_HPP_NOEXCEPT;
|
getAccelerationStructureCompatibilityKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureVersionInfoKHR & versionInfo ) const VULKAN_HPP_NOEXCEPT;
|
||||||
|
|
||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::AccelerationStructureBuildSizesInfoKHR getAccelerationStructureBuildSizesKHR(
|
VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::AccelerationStructureBuildSizesInfoKHR
|
||||||
VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR buildType,
|
getAccelerationStructureBuildSizesKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR buildType,
|
||||||
const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR & buildInfo,
|
const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR & buildInfo,
|
||||||
ArrayProxy<const uint32_t> const & maxPrimitiveCounts VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
ArrayProxy<const uint32_t> const & maxPrimitiveCounts VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const;
|
||||||
|
|
||||||
//=== VK_KHR_sampler_ycbcr_conversion ===
|
//=== VK_KHR_sampler_ycbcr_conversion ===
|
||||||
|
|
||||||
@ -4579,7 +4579,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
|
|
||||||
void bindVertexBuffers( uint32_t firstBinding,
|
void bindVertexBuffers( uint32_t firstBinding,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets ) const;
|
||||||
|
|
||||||
void draw( uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance ) const VULKAN_HPP_NOEXCEPT;
|
void draw( uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance ) const VULKAN_HPP_NOEXCEPT;
|
||||||
|
|
||||||
@ -4750,7 +4750,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stageMask VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
|
VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stageMask VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
|
||||||
|
|
||||||
void waitEvents2( ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const & events,
|
void waitEvents2( ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const & events,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DependencyInfo> const & dependencyInfos ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DependencyInfo> const & dependencyInfos ) const;
|
||||||
|
|
||||||
void pipelineBarrier2( const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT;
|
void pipelineBarrier2( const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT;
|
||||||
|
|
||||||
@ -4787,8 +4787,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const;
|
||||||
VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
|
||||||
|
|
||||||
void setDepthTestEnable( VULKAN_HPP_NAMESPACE::Bool32 depthTestEnable ) const VULKAN_HPP_NOEXCEPT;
|
void setDepthTestEnable( VULKAN_HPP_NAMESPACE::Bool32 depthTestEnable ) const VULKAN_HPP_NOEXCEPT;
|
||||||
|
|
||||||
@ -4842,17 +4841,17 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes
|
||||||
VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const;
|
||||||
|
|
||||||
void beginTransformFeedbackEXT( uint32_t firstCounterBuffer,
|
void beginTransformFeedbackEXT( uint32_t firstCounterBuffer,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & counterBuffers,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & counterBuffers,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & counterBufferOffsets
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & counterBufferOffsets
|
||||||
VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const;
|
||||||
|
|
||||||
void endTransformFeedbackEXT( uint32_t firstCounterBuffer,
|
void endTransformFeedbackEXT( uint32_t firstCounterBuffer,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & counterBuffers,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & counterBuffers,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & counterBufferOffsets
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & counterBufferOffsets
|
||||||
VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const;
|
||||||
|
|
||||||
void beginQueryIndexedEXT( VULKAN_HPP_NAMESPACE::QueryPool queryPool,
|
void beginQueryIndexedEXT( VULKAN_HPP_NAMESPACE::QueryPool queryPool,
|
||||||
uint32_t query,
|
uint32_t query,
|
||||||
@ -4954,15 +4953,14 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
|
|
||||||
//=== VK_KHR_acceleration_structure ===
|
//=== VK_KHR_acceleration_structure ===
|
||||||
|
|
||||||
void buildAccelerationStructuresKHR( ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const & infos,
|
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos )
|
|
||||||
const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
|
||||||
|
|
||||||
void
|
void
|
||||||
buildAccelerationStructuresIndirectKHR( ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const & infos,
|
buildAccelerationStructuresKHR( ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const & infos,
|
||||||
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos ) const;
|
||||||
|
|
||||||
|
void buildAccelerationStructuresIndirectKHR( ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const & infos,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceAddress> const & indirectDeviceAddresses,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceAddress> const & indirectDeviceAddresses,
|
||||||
ArrayProxy<const uint32_t> const & indirectStrides,
|
ArrayProxy<const uint32_t> const & indirectStrides,
|
||||||
ArrayProxy<const uint32_t * const> const & pMaxPrimitiveCounts ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
ArrayProxy<const uint32_t * const> const & pMaxPrimitiveCounts ) const;
|
||||||
|
|
||||||
void copyAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR & info ) const VULKAN_HPP_NOEXCEPT;
|
void copyAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR & info ) const VULKAN_HPP_NOEXCEPT;
|
||||||
|
|
||||||
@ -5103,8 +5101,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const;
|
||||||
VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
|
||||||
|
|
||||||
void setDepthTestEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthTestEnable ) const VULKAN_HPP_NOEXCEPT;
|
void setDepthTestEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthTestEnable ) const VULKAN_HPP_NOEXCEPT;
|
||||||
|
|
||||||
@ -5147,7 +5144,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stageMask VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
|
VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stageMask VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
|
||||||
|
|
||||||
void waitEvents2KHR( ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const & events,
|
void waitEvents2KHR( ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const & events,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DependencyInfo> const & dependencyInfos ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DependencyInfo> const & dependencyInfos ) const;
|
||||||
|
|
||||||
void pipelineBarrier2KHR( const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT;
|
void pipelineBarrier2KHR( const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT;
|
||||||
|
|
||||||
@ -10960,20 +10957,14 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
static_cast<VkIndexType>( indexType ) );
|
static_cast<VkIndexType>( indexType ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
VULKAN_HPP_INLINE void
|
VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers( uint32_t firstBinding,
|
||||||
CommandBuffer::bindVertexBuffers( uint32_t firstBinding,
|
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets ) const
|
||||||
{
|
{
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
|
||||||
VULKAN_HPP_ASSERT( buffers.size() == offsets.size() );
|
|
||||||
# else
|
|
||||||
if ( buffers.size() != offsets.size() )
|
if ( buffers.size() != offsets.size() )
|
||||||
{
|
{
|
||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::bindVertexBuffers: buffers.size() != offsets.size()" );
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::bindVertexBuffers: buffers.size() != offsets.size()" );
|
||||||
}
|
}
|
||||||
# endif /*VULKAN_HPP_NO_EXCEPTIONS*/
|
|
||||||
|
|
||||||
getDispatcher()->vkCmdBindVertexBuffers( static_cast<VkCommandBuffer>( m_commandBuffer ),
|
getDispatcher()->vkCmdBindVertexBuffers( static_cast<VkCommandBuffer>( m_commandBuffer ),
|
||||||
firstBinding,
|
firstBinding,
|
||||||
buffers.size(),
|
buffers.size(),
|
||||||
@ -11908,19 +11899,13 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkEvent>( event ), static_cast<VkPipelineStageFlags2>( stageMask ) );
|
static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkEvent>( event ), static_cast<VkPipelineStageFlags2>( stageMask ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
VULKAN_HPP_INLINE void
|
VULKAN_HPP_INLINE void CommandBuffer::waitEvents2( ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const & events,
|
||||||
CommandBuffer::waitEvents2( ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const & events,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DependencyInfo> const & dependencyInfos ) const
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DependencyInfo> const & dependencyInfos ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
|
||||||
{
|
{
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
|
||||||
VULKAN_HPP_ASSERT( events.size() == dependencyInfos.size() );
|
|
||||||
# else
|
|
||||||
if ( events.size() != dependencyInfos.size() )
|
if ( events.size() != dependencyInfos.size() )
|
||||||
{
|
{
|
||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::waitEvents2: events.size() != dependencyInfos.size()" );
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::waitEvents2: events.size() != dependencyInfos.size()" );
|
||||||
}
|
}
|
||||||
# endif /*VULKAN_HPP_NO_EXCEPTIONS*/
|
|
||||||
|
|
||||||
getDispatcher()->vkCmdWaitEvents2( static_cast<VkCommandBuffer>( m_commandBuffer ),
|
getDispatcher()->vkCmdWaitEvents2( static_cast<VkCommandBuffer>( m_commandBuffer ),
|
||||||
events.size(),
|
events.size(),
|
||||||
reinterpret_cast<const VkEvent *>( events.data() ),
|
reinterpret_cast<const VkEvent *>( events.data() ),
|
||||||
@ -12022,18 +12007,12 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
static_cast<VkCommandBuffer>( m_commandBuffer ), scissors.size(), reinterpret_cast<const VkRect2D *>( scissors.data() ) );
|
static_cast<VkCommandBuffer>( m_commandBuffer ), scissors.size(), reinterpret_cast<const VkRect2D *>( scissors.data() ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
VULKAN_HPP_INLINE void
|
VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers2( uint32_t firstBinding,
|
||||||
CommandBuffer::bindVertexBuffers2( uint32_t firstBinding,
|
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides ) const
|
||||||
{
|
{
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
|
||||||
VULKAN_HPP_ASSERT( buffers.size() == offsets.size() );
|
|
||||||
VULKAN_HPP_ASSERT( sizes.empty() || buffers.size() == sizes.size() );
|
|
||||||
VULKAN_HPP_ASSERT( strides.empty() || buffers.size() == strides.size() );
|
|
||||||
# else
|
|
||||||
if ( buffers.size() != offsets.size() )
|
if ( buffers.size() != offsets.size() )
|
||||||
{
|
{
|
||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::bindVertexBuffers2: buffers.size() != offsets.size()" );
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::bindVertexBuffers2: buffers.size() != offsets.size()" );
|
||||||
@ -12046,8 +12025,6 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
{
|
{
|
||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::bindVertexBuffers2: buffers.size() != strides.size()" );
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::bindVertexBuffers2: buffers.size() != strides.size()" );
|
||||||
}
|
}
|
||||||
# endif /*VULKAN_HPP_NO_EXCEPTIONS*/
|
|
||||||
|
|
||||||
getDispatcher()->vkCmdBindVertexBuffers2( static_cast<VkCommandBuffer>( m_commandBuffer ),
|
getDispatcher()->vkCmdBindVertexBuffers2( static_cast<VkCommandBuffer>( m_commandBuffer ),
|
||||||
firstBinding,
|
firstBinding,
|
||||||
buffers.size(),
|
buffers.size(),
|
||||||
@ -12986,15 +12963,10 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes ) const
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes ) const
|
||||||
VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
|
||||||
{
|
{
|
||||||
VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindTransformFeedbackBuffersEXT &&
|
VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindTransformFeedbackBuffersEXT &&
|
||||||
"Function <vkCmdBindTransformFeedbackBuffersEXT> needs extension <VK_EXT_transform_feedback> enabled!" );
|
"Function <vkCmdBindTransformFeedbackBuffersEXT> needs extension <VK_EXT_transform_feedback> enabled!" );
|
||||||
|
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
|
||||||
VULKAN_HPP_ASSERT( buffers.size() == offsets.size() );
|
|
||||||
VULKAN_HPP_ASSERT( sizes.empty() || buffers.size() == sizes.size() );
|
|
||||||
# else
|
|
||||||
if ( buffers.size() != offsets.size() )
|
if ( buffers.size() != offsets.size() )
|
||||||
{
|
{
|
||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::bindTransformFeedbackBuffersEXT: buffers.size() != offsets.size()" );
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::bindTransformFeedbackBuffersEXT: buffers.size() != offsets.size()" );
|
||||||
@ -13003,8 +12975,6 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
{
|
{
|
||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::bindTransformFeedbackBuffersEXT: buffers.size() != sizes.size()" );
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::bindTransformFeedbackBuffersEXT: buffers.size() != sizes.size()" );
|
||||||
}
|
}
|
||||||
# endif /*VULKAN_HPP_NO_EXCEPTIONS*/
|
|
||||||
|
|
||||||
getDispatcher()->vkCmdBindTransformFeedbackBuffersEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
|
getDispatcher()->vkCmdBindTransformFeedbackBuffersEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
|
||||||
firstBinding,
|
firstBinding,
|
||||||
buffers.size(),
|
buffers.size(),
|
||||||
@ -13016,20 +12986,14 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_INLINE void CommandBuffer::beginTransformFeedbackEXT( uint32_t firstCounterBuffer,
|
VULKAN_HPP_INLINE void CommandBuffer::beginTransformFeedbackEXT( uint32_t firstCounterBuffer,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & counterBuffers,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & counterBuffers,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & counterBufferOffsets ) const
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & counterBufferOffsets ) const
|
||||||
VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
|
||||||
{
|
{
|
||||||
VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBeginTransformFeedbackEXT &&
|
VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBeginTransformFeedbackEXT &&
|
||||||
"Function <vkCmdBeginTransformFeedbackEXT> needs extension <VK_EXT_transform_feedback> enabled!" );
|
"Function <vkCmdBeginTransformFeedbackEXT> needs extension <VK_EXT_transform_feedback> enabled!" );
|
||||||
|
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
|
||||||
VULKAN_HPP_ASSERT( counterBufferOffsets.empty() || counterBuffers.size() == counterBufferOffsets.size() );
|
|
||||||
# else
|
|
||||||
if ( !counterBufferOffsets.empty() && counterBuffers.size() != counterBufferOffsets.size() )
|
if ( !counterBufferOffsets.empty() && counterBuffers.size() != counterBufferOffsets.size() )
|
||||||
{
|
{
|
||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::beginTransformFeedbackEXT: counterBuffers.size() != counterBufferOffsets.size()" );
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::beginTransformFeedbackEXT: counterBuffers.size() != counterBufferOffsets.size()" );
|
||||||
}
|
}
|
||||||
# endif /*VULKAN_HPP_NO_EXCEPTIONS*/
|
|
||||||
|
|
||||||
getDispatcher()->vkCmdBeginTransformFeedbackEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
|
getDispatcher()->vkCmdBeginTransformFeedbackEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
|
||||||
firstCounterBuffer,
|
firstCounterBuffer,
|
||||||
counterBuffers.size(),
|
counterBuffers.size(),
|
||||||
@ -13040,20 +13004,14 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_INLINE void CommandBuffer::endTransformFeedbackEXT( uint32_t firstCounterBuffer,
|
VULKAN_HPP_INLINE void CommandBuffer::endTransformFeedbackEXT( uint32_t firstCounterBuffer,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & counterBuffers,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & counterBuffers,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & counterBufferOffsets ) const
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & counterBufferOffsets ) const
|
||||||
VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
|
||||||
{
|
{
|
||||||
VULKAN_HPP_ASSERT( getDispatcher()->vkCmdEndTransformFeedbackEXT &&
|
VULKAN_HPP_ASSERT( getDispatcher()->vkCmdEndTransformFeedbackEXT &&
|
||||||
"Function <vkCmdEndTransformFeedbackEXT> needs extension <VK_EXT_transform_feedback> enabled!" );
|
"Function <vkCmdEndTransformFeedbackEXT> needs extension <VK_EXT_transform_feedback> enabled!" );
|
||||||
|
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
|
||||||
VULKAN_HPP_ASSERT( counterBufferOffsets.empty() || counterBuffers.size() == counterBufferOffsets.size() );
|
|
||||||
# else
|
|
||||||
if ( !counterBufferOffsets.empty() && counterBuffers.size() != counterBufferOffsets.size() )
|
if ( !counterBufferOffsets.empty() && counterBuffers.size() != counterBufferOffsets.size() )
|
||||||
{
|
{
|
||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::endTransformFeedbackEXT: counterBuffers.size() != counterBufferOffsets.size()" );
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::endTransformFeedbackEXT: counterBuffers.size() != counterBufferOffsets.size()" );
|
||||||
}
|
}
|
||||||
# endif /*VULKAN_HPP_NO_EXCEPTIONS*/
|
|
||||||
|
|
||||||
getDispatcher()->vkCmdEndTransformFeedbackEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
|
getDispatcher()->vkCmdEndTransformFeedbackEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
|
||||||
firstCounterBuffer,
|
firstCounterBuffer,
|
||||||
counterBuffers.size(),
|
counterBuffers.size(),
|
||||||
@ -14036,21 +13994,15 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
|
|
||||||
//=== VK_EXT_hdr_metadata ===
|
//=== VK_EXT_hdr_metadata ===
|
||||||
|
|
||||||
VULKAN_HPP_INLINE void
|
VULKAN_HPP_INLINE void Device::setHdrMetadataEXT( ArrayProxy<const VULKAN_HPP_NAMESPACE::SwapchainKHR> const & swapchains,
|
||||||
Device::setHdrMetadataEXT( ArrayProxy<const VULKAN_HPP_NAMESPACE::SwapchainKHR> const & swapchains,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::HdrMetadataEXT> const & metadata ) const
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::HdrMetadataEXT> const & metadata ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
|
||||||
{
|
{
|
||||||
VULKAN_HPP_ASSERT( getDispatcher()->vkSetHdrMetadataEXT && "Function <vkSetHdrMetadataEXT> needs extension <VK_EXT_hdr_metadata> enabled!" );
|
VULKAN_HPP_ASSERT( getDispatcher()->vkSetHdrMetadataEXT && "Function <vkSetHdrMetadataEXT> needs extension <VK_EXT_hdr_metadata> enabled!" );
|
||||||
|
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
|
||||||
VULKAN_HPP_ASSERT( swapchains.size() == metadata.size() );
|
|
||||||
# else
|
|
||||||
if ( swapchains.size() != metadata.size() )
|
if ( swapchains.size() != metadata.size() )
|
||||||
{
|
{
|
||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::Device::setHdrMetadataEXT: swapchains.size() != metadata.size()" );
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::Device::setHdrMetadataEXT: swapchains.size() != metadata.size()" );
|
||||||
}
|
}
|
||||||
# endif /*VULKAN_HPP_NO_EXCEPTIONS*/
|
|
||||||
|
|
||||||
getDispatcher()->vkSetHdrMetadataEXT( static_cast<VkDevice>( m_device ),
|
getDispatcher()->vkSetHdrMetadataEXT( static_cast<VkDevice>( m_device ),
|
||||||
swapchains.size(),
|
swapchains.size(),
|
||||||
reinterpret_cast<const VkSwapchainKHR *>( swapchains.data() ),
|
reinterpret_cast<const VkSwapchainKHR *>( swapchains.data() ),
|
||||||
@ -14751,20 +14703,14 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructuresKHR(
|
VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructuresKHR(
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const & infos,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const & infos,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos ) const
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos ) const
|
||||||
VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
|
||||||
{
|
{
|
||||||
VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBuildAccelerationStructuresKHR &&
|
VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBuildAccelerationStructuresKHR &&
|
||||||
"Function <vkCmdBuildAccelerationStructuresKHR> needs extension <VK_KHR_acceleration_structure> enabled!" );
|
"Function <vkCmdBuildAccelerationStructuresKHR> needs extension <VK_KHR_acceleration_structure> enabled!" );
|
||||||
|
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
|
||||||
VULKAN_HPP_ASSERT( infos.size() == pBuildRangeInfos.size() );
|
|
||||||
# else
|
|
||||||
if ( infos.size() != pBuildRangeInfos.size() )
|
if ( infos.size() != pBuildRangeInfos.size() )
|
||||||
{
|
{
|
||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::buildAccelerationStructuresKHR: infos.size() != pBuildRangeInfos.size()" );
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::buildAccelerationStructuresKHR: infos.size() != pBuildRangeInfos.size()" );
|
||||||
}
|
}
|
||||||
# endif /*VULKAN_HPP_NO_EXCEPTIONS*/
|
|
||||||
|
|
||||||
getDispatcher()->vkCmdBuildAccelerationStructuresKHR(
|
getDispatcher()->vkCmdBuildAccelerationStructuresKHR(
|
||||||
static_cast<VkCommandBuffer>( m_commandBuffer ),
|
static_cast<VkCommandBuffer>( m_commandBuffer ),
|
||||||
infos.size(),
|
infos.size(),
|
||||||
@ -14772,20 +14718,15 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
reinterpret_cast<const VkAccelerationStructureBuildRangeInfoKHR * const *>( pBuildRangeInfos.data() ) );
|
reinterpret_cast<const VkAccelerationStructureBuildRangeInfoKHR * const *>( pBuildRangeInfos.data() ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructuresIndirectKHR(
|
VULKAN_HPP_INLINE void
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const & infos,
|
CommandBuffer::buildAccelerationStructuresIndirectKHR( ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const & infos,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceAddress> const & indirectDeviceAddresses,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceAddress> const & indirectDeviceAddresses,
|
||||||
ArrayProxy<const uint32_t> const & indirectStrides,
|
ArrayProxy<const uint32_t> const & indirectStrides,
|
||||||
ArrayProxy<const uint32_t * const> const & pMaxPrimitiveCounts ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
ArrayProxy<const uint32_t * const> const & pMaxPrimitiveCounts ) const
|
||||||
{
|
{
|
||||||
VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBuildAccelerationStructuresIndirectKHR &&
|
VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBuildAccelerationStructuresIndirectKHR &&
|
||||||
"Function <vkCmdBuildAccelerationStructuresIndirectKHR> needs extension <VK_KHR_acceleration_structure> enabled!" );
|
"Function <vkCmdBuildAccelerationStructuresIndirectKHR> needs extension <VK_KHR_acceleration_structure> enabled!" );
|
||||||
|
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
|
||||||
VULKAN_HPP_ASSERT( infos.size() == indirectDeviceAddresses.size() );
|
|
||||||
VULKAN_HPP_ASSERT( infos.size() == indirectStrides.size() );
|
|
||||||
VULKAN_HPP_ASSERT( infos.size() == pMaxPrimitiveCounts.size() );
|
|
||||||
# else
|
|
||||||
if ( infos.size() != indirectDeviceAddresses.size() )
|
if ( infos.size() != indirectDeviceAddresses.size() )
|
||||||
{
|
{
|
||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING
|
||||||
@ -14799,8 +14740,6 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
{
|
{
|
||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::buildAccelerationStructuresIndirectKHR: infos.size() != pMaxPrimitiveCounts.size()" );
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::buildAccelerationStructuresIndirectKHR: infos.size() != pMaxPrimitiveCounts.size()" );
|
||||||
}
|
}
|
||||||
# endif /*VULKAN_HPP_NO_EXCEPTIONS*/
|
|
||||||
|
|
||||||
getDispatcher()->vkCmdBuildAccelerationStructuresIndirectKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
|
getDispatcher()->vkCmdBuildAccelerationStructuresIndirectKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
|
||||||
infos.size(),
|
infos.size(),
|
||||||
reinterpret_cast<const VkAccelerationStructureBuildGeometryInfoKHR *>( infos.data() ),
|
reinterpret_cast<const VkAccelerationStructureBuildGeometryInfoKHR *>( infos.data() ),
|
||||||
@ -14816,6 +14755,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
{
|
{
|
||||||
VULKAN_HPP_ASSERT( getDispatcher()->vkBuildAccelerationStructuresKHR &&
|
VULKAN_HPP_ASSERT( getDispatcher()->vkBuildAccelerationStructuresKHR &&
|
||||||
"Function <vkBuildAccelerationStructuresKHR> needs extension <VK_KHR_acceleration_structure> enabled!" );
|
"Function <vkBuildAccelerationStructuresKHR> needs extension <VK_KHR_acceleration_structure> enabled!" );
|
||||||
|
|
||||||
if ( infos.size() != pBuildRangeInfos.size() )
|
if ( infos.size() != pBuildRangeInfos.size() )
|
||||||
{
|
{
|
||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::Device::buildAccelerationStructuresKHR: infos.size() != pBuildRangeInfos.size()" );
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::Device::buildAccelerationStructuresKHR: infos.size() != pBuildRangeInfos.size()" );
|
||||||
@ -15014,20 +14954,15 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::AccelerationStructureBuildSizesInfoKHR
|
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::AccelerationStructureBuildSizesInfoKHR
|
||||||
Device::getAccelerationStructureBuildSizesKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR buildType,
|
Device::getAccelerationStructureBuildSizesKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR buildType,
|
||||||
const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR & buildInfo,
|
const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR & buildInfo,
|
||||||
ArrayProxy<const uint32_t> const & maxPrimitiveCounts ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
ArrayProxy<const uint32_t> const & maxPrimitiveCounts ) const
|
||||||
{
|
{
|
||||||
VULKAN_HPP_ASSERT( getDispatcher()->vkGetAccelerationStructureBuildSizesKHR &&
|
VULKAN_HPP_ASSERT( getDispatcher()->vkGetAccelerationStructureBuildSizesKHR &&
|
||||||
"Function <vkGetAccelerationStructureBuildSizesKHR> needs extension <VK_KHR_acceleration_structure> enabled!" );
|
"Function <vkGetAccelerationStructureBuildSizesKHR> needs extension <VK_KHR_acceleration_structure> enabled!" );
|
||||||
|
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
|
||||||
VULKAN_HPP_ASSERT( maxPrimitiveCounts.size() == buildInfo.geometryCount );
|
|
||||||
# else
|
|
||||||
if ( maxPrimitiveCounts.size() != buildInfo.geometryCount )
|
if ( maxPrimitiveCounts.size() != buildInfo.geometryCount )
|
||||||
{
|
{
|
||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::Device::getAccelerationStructureBuildSizesKHR: maxPrimitiveCounts.size() != buildInfo.geometryCount" );
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::Device::getAccelerationStructureBuildSizesKHR: maxPrimitiveCounts.size() != buildInfo.geometryCount" );
|
||||||
}
|
}
|
||||||
# endif /*VULKAN_HPP_NO_EXCEPTIONS*/
|
|
||||||
|
|
||||||
VULKAN_HPP_NAMESPACE::AccelerationStructureBuildSizesInfoKHR sizeInfo;
|
VULKAN_HPP_NAMESPACE::AccelerationStructureBuildSizesInfoKHR sizeInfo;
|
||||||
getDispatcher()->vkGetAccelerationStructureBuildSizesKHR( static_cast<VkDevice>( m_device ),
|
getDispatcher()->vkGetAccelerationStructureBuildSizesKHR( static_cast<VkDevice>( m_device ),
|
||||||
static_cast<VkAccelerationStructureBuildTypeKHR>( buildType ),
|
static_cast<VkAccelerationStructureBuildTypeKHR>( buildType ),
|
||||||
@ -16256,21 +16191,15 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
static_cast<VkCommandBuffer>( m_commandBuffer ), scissors.size(), reinterpret_cast<const VkRect2D *>( scissors.data() ) );
|
static_cast<VkCommandBuffer>( m_commandBuffer ), scissors.size(), reinterpret_cast<const VkRect2D *>( scissors.data() ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
VULKAN_HPP_INLINE void
|
VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers2EXT( uint32_t firstBinding,
|
||||||
CommandBuffer::bindVertexBuffers2EXT( uint32_t firstBinding,
|
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides ) const
|
||||||
{
|
{
|
||||||
VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindVertexBuffers2EXT &&
|
VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindVertexBuffers2EXT &&
|
||||||
"Function <vkCmdBindVertexBuffers2EXT> needs extension <VK_EXT_extended_dynamic_state> enabled!" );
|
"Function <vkCmdBindVertexBuffers2EXT> needs extension <VK_EXT_extended_dynamic_state> enabled!" );
|
||||||
|
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
|
||||||
VULKAN_HPP_ASSERT( buffers.size() == offsets.size() );
|
|
||||||
VULKAN_HPP_ASSERT( sizes.empty() || buffers.size() == sizes.size() );
|
|
||||||
VULKAN_HPP_ASSERT( strides.empty() || buffers.size() == strides.size() );
|
|
||||||
# else
|
|
||||||
if ( buffers.size() != offsets.size() )
|
if ( buffers.size() != offsets.size() )
|
||||||
{
|
{
|
||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::bindVertexBuffers2EXT: buffers.size() != offsets.size()" );
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::bindVertexBuffers2EXT: buffers.size() != offsets.size()" );
|
||||||
@ -16283,8 +16212,6 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
{
|
{
|
||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::bindVertexBuffers2EXT: buffers.size() != strides.size()" );
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::bindVertexBuffers2EXT: buffers.size() != strides.size()" );
|
||||||
}
|
}
|
||||||
# endif /*VULKAN_HPP_NO_EXCEPTIONS*/
|
|
||||||
|
|
||||||
getDispatcher()->vkCmdBindVertexBuffers2EXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
|
getDispatcher()->vkCmdBindVertexBuffers2EXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
|
||||||
firstBinding,
|
firstBinding,
|
||||||
buffers.size(),
|
buffers.size(),
|
||||||
@ -16681,19 +16608,13 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
|
|
||||||
VULKAN_HPP_INLINE void CommandBuffer::waitEvents2KHR( ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const & events,
|
VULKAN_HPP_INLINE void CommandBuffer::waitEvents2KHR( ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const & events,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DependencyInfo> const & dependencyInfos ) const
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DependencyInfo> const & dependencyInfos ) const
|
||||||
VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
|
||||||
{
|
{
|
||||||
VULKAN_HPP_ASSERT( getDispatcher()->vkCmdWaitEvents2KHR && "Function <vkCmdWaitEvents2KHR> needs extension <VK_KHR_synchronization2> enabled!" );
|
VULKAN_HPP_ASSERT( getDispatcher()->vkCmdWaitEvents2KHR && "Function <vkCmdWaitEvents2KHR> needs extension <VK_KHR_synchronization2> enabled!" );
|
||||||
|
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
|
||||||
VULKAN_HPP_ASSERT( events.size() == dependencyInfos.size() );
|
|
||||||
# else
|
|
||||||
if ( events.size() != dependencyInfos.size() )
|
if ( events.size() != dependencyInfos.size() )
|
||||||
{
|
{
|
||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::waitEvents2KHR: events.size() != dependencyInfos.size()" );
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::waitEvents2KHR: events.size() != dependencyInfos.size()" );
|
||||||
}
|
}
|
||||||
# endif /*VULKAN_HPP_NO_EXCEPTIONS*/
|
|
||||||
|
|
||||||
getDispatcher()->vkCmdWaitEvents2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
|
getDispatcher()->vkCmdWaitEvents2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
|
||||||
events.size(),
|
events.size(),
|
||||||
reinterpret_cast<const VkEvent *>( events.data() ),
|
reinterpret_cast<const VkEvent *>( events.data() ),
|
||||||
|
Loading…
Reference in New Issue
Block a user