Merge pull request #758 from asuessenbach/noexcept
Correct usage of noexcept on functions that need to check vector sizes.
This commit is contained in:
commit
28a18d49cb
@ -4579,37 +4579,43 @@ std::string VulkanHppGenerator::constructCommandSimpleVoid( std::string const &
|
|||||||
( commandData.params[vectorParamIndices.begin()->first].type.type == "void" ) )
|
( commandData.params[vectorParamIndices.begin()->first].type.type == "void" ) )
|
||||||
? "typename T, "
|
? "typename T, "
|
||||||
: "";
|
: "";
|
||||||
|
std::pair<bool, std::map<size_t, std::vector<size_t>>> vectorSizeCheck =
|
||||||
|
needsVectorSizeCheck( vectorParamIndices );
|
||||||
|
std::string noexceptString = vectorSizeCheck.first ? "VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS" : "VULKAN_HPP_NOEXCEPT";
|
||||||
|
|
||||||
if ( definition )
|
if ( definition )
|
||||||
{
|
{
|
||||||
std::string const functionTemplate =
|
std::string const functionTemplate =
|
||||||
R"( template <${typenameT}typename Dispatch>
|
R"( template <${typenameT}typename Dispatch>
|
||||||
VULKAN_HPP_INLINE void ${className}::${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT
|
VULKAN_HPP_INLINE void ${className}::${commandName}( ${argumentList} ) const ${noexcept}
|
||||||
{${vectorSizeCheck}
|
{${vectorSizeCheck}
|
||||||
d.${vkCommand}( ${callArguments} );
|
d.${vkCommand}( ${callArguments} );
|
||||||
})";
|
})";
|
||||||
|
|
||||||
str =
|
str = replaceWithMap(
|
||||||
replaceWithMap( functionTemplate,
|
functionTemplate,
|
||||||
std::map<std::string, std::string>(
|
std::map<std::string, std::string>(
|
||||||
{ { "argumentList", argumentList },
|
{ { "argumentList", argumentList },
|
||||||
{ "callArguments", constructCallArgumentsVectors( commandData.params, vectorParamIndices ) },
|
{ "callArguments", constructCallArgumentsVectors( commandData.params, vectorParamIndices ) },
|
||||||
{ "className", stripPrefix( commandData.handle, "Vk" ) },
|
{ "className", stripPrefix( commandData.handle, "Vk" ) },
|
||||||
{ "commandName", commandName },
|
{ "commandName", commandName },
|
||||||
{ "typenameT", typenameT },
|
{ "noexcept", noexceptString },
|
||||||
{ "vectorSizeCheck", constructVectorSizeCheck( name, commandData, vectorParamIndices ) },
|
{ "typenameT", typenameT },
|
||||||
{ "vkCommand", name } } ) );
|
{ "vectorSizeCheck",
|
||||||
|
vectorSizeCheck.first ? constructVectorSizeCheck( name, commandData, vectorSizeCheck.second ) : "" },
|
||||||
|
{ "vkCommand", name } } ) );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
std::string const functionTemplate =
|
std::string const functionTemplate =
|
||||||
R"( template <${typenameT}typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
R"( template <${typenameT}typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
||||||
void ${commandName}( ${argumentList} ) const VULKAN_HPP_NOEXCEPT;)";
|
void ${commandName}( ${argumentList} ) const ${noexcept};)";
|
||||||
|
|
||||||
str = replaceWithMap(
|
str = replaceWithMap( functionTemplate,
|
||||||
functionTemplate,
|
std::map<std::string, std::string>( { { "argumentList", argumentList },
|
||||||
std::map<std::string, std::string>(
|
{ "commandName", commandName },
|
||||||
{ { "argumentList", argumentList }, { "commandName", commandName }, { "typenameT", typenameT } } ) );
|
{ "noexcept", noexceptString },
|
||||||
|
{ "typenameT", typenameT } } ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
return str;
|
return str;
|
||||||
@ -5043,70 +5049,57 @@ std::string VulkanHppGenerator::constructSuccessCodeList( std::vector<std::strin
|
|||||||
return successCodeList;
|
return successCodeList;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string VulkanHppGenerator::constructVectorSizeCheck( std::string const & name,
|
std::string
|
||||||
CommandData const & commandData,
|
VulkanHppGenerator::constructVectorSizeCheck( std::string const & name,
|
||||||
std::map<size_t, size_t> const & vectorParamIndices ) const
|
CommandData const & commandData,
|
||||||
|
std::map<size_t, std::vector<size_t>> const & countToVectorMap ) const
|
||||||
{
|
{
|
||||||
std::string str;
|
std::string str;
|
||||||
|
|
||||||
std::map<size_t, std::vector<size_t>> countToVectorMap;
|
std::string const assertTemplate =
|
||||||
for ( auto const & vpi : vectorParamIndices )
|
" VULKAN_HPP_ASSERT( ${zeroSizeCheck}${firstVectorName}.size() == ${secondVectorName}.size() );";
|
||||||
|
std::string const throwTemplate =
|
||||||
|
R"#( if ( ${zeroSizeCheck}${firstVectorName}.size() != ${secondVectorName}.size() )
|
||||||
{
|
{
|
||||||
if ( vpi.second != INVALID_INDEX )
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::${className}::${commandName}: ${firstVectorName}.size() != ${secondVectorName}.size()" );
|
||||||
|
})#";
|
||||||
|
|
||||||
|
std::string commandName = determineCommandName( name, commandData.params[0].type.type );
|
||||||
|
|
||||||
|
std::string assertions, throws;
|
||||||
|
for ( auto const & cvm : countToVectorMap )
|
||||||
|
{
|
||||||
|
assert( !commandData.params[cvm.second[0]].optional );
|
||||||
|
|
||||||
|
size_t defaultStartIndex = determineDefaultStartIndex( commandData.params );
|
||||||
|
std::string firstVectorName = startLowerCase( stripPrefix( commandData.params[cvm.second[0]].name, "p" ) );
|
||||||
|
|
||||||
|
for ( size_t i = 1; i < cvm.second.size(); i++ )
|
||||||
{
|
{
|
||||||
countToVectorMap[vpi.second].push_back( vpi.first );
|
std::string secondVectorName = startLowerCase( stripPrefix( commandData.params[cvm.second[i]].name, "p" ) );
|
||||||
|
bool withZeroSizeCheck = commandData.params[cvm.second[i]].optional && ( defaultStartIndex <= cvm.second[i] );
|
||||||
|
assertions +=
|
||||||
|
replaceWithMap( assertTemplate,
|
||||||
|
{ { "firstVectorName", firstVectorName },
|
||||||
|
{ "secondVectorName", secondVectorName },
|
||||||
|
{ "zeroSizeCheck", withZeroSizeCheck ? ( secondVectorName + ".empty() || " ) : "" } } );
|
||||||
|
throws +=
|
||||||
|
replaceWithMap( throwTemplate,
|
||||||
|
{ { "firstVectorName", firstVectorName },
|
||||||
|
{ "className", stripPrefix( commandData.handle, "Vk" ) },
|
||||||
|
{ "commandName", commandName },
|
||||||
|
{ "secondVectorName", secondVectorName },
|
||||||
|
{ "zeroSizeCheck", withZeroSizeCheck ? ( "!" + secondVectorName + ".empty() && " ) : "" } } );
|
||||||
|
if ( i + 1 < cvm.second.size() )
|
||||||
|
{
|
||||||
|
assertions += "\n";
|
||||||
|
throws += "\n";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// check if there's at least one count used multiple times
|
std::string const sizeCheckTemplate =
|
||||||
if ( std::find_if( countToVectorMap.begin(), countToVectorMap.end(), []( auto const & cvm ) {
|
R"#(
|
||||||
return 1 < cvm.second.size();
|
|
||||||
} ) != countToVectorMap.end() )
|
|
||||||
{
|
|
||||||
std::string const assertTemplate =
|
|
||||||
" VULKAN_HPP_ASSERT( ${zeroSizeCheck}${firstVectorName}.size() == ${secondVectorName}.size() );";
|
|
||||||
std::string const throwTemplate =
|
|
||||||
R"#( if ( ${zeroSizeCheck}${firstVectorName}.size() != ${secondVectorName}.size() )
|
|
||||||
{
|
|
||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::${className}::${commandName}: ${firstVectorName}.size() != ${secondVectorName}.size()" );
|
|
||||||
})#";
|
|
||||||
|
|
||||||
std::string commandName = determineCommandName( name, commandData.params[0].type.type );
|
|
||||||
|
|
||||||
std::string assertions, throws;
|
|
||||||
for ( auto const & cvm : countToVectorMap )
|
|
||||||
{
|
|
||||||
assert( !commandData.params[cvm.second[0]].optional );
|
|
||||||
|
|
||||||
size_t defaultStartIndex = determineDefaultStartIndex( commandData.params );
|
|
||||||
std::string firstVectorName = startLowerCase( stripPrefix( commandData.params[cvm.second[0]].name, "p" ) );
|
|
||||||
|
|
||||||
for ( size_t i = 1; i < cvm.second.size(); i++ )
|
|
||||||
{
|
|
||||||
std::string secondVectorName = startLowerCase( stripPrefix( commandData.params[cvm.second[i]].name, "p" ) );
|
|
||||||
bool withZeroSizeCheck = commandData.params[cvm.second[i]].optional && ( defaultStartIndex <= cvm.second[i] );
|
|
||||||
assertions +=
|
|
||||||
replaceWithMap( assertTemplate,
|
|
||||||
{ { "firstVectorName", firstVectorName },
|
|
||||||
{ "secondVectorName", secondVectorName },
|
|
||||||
{ "zeroSizeCheck", withZeroSizeCheck ? ( secondVectorName + ".empty() || " ) : "" } } );
|
|
||||||
throws += replaceWithMap(
|
|
||||||
throwTemplate,
|
|
||||||
{ { "firstVectorName", firstVectorName },
|
|
||||||
{ "className", stripPrefix( commandData.handle, "Vk" ) },
|
|
||||||
{ "commandName", commandName },
|
|
||||||
{ "secondVectorName", secondVectorName },
|
|
||||||
{ "zeroSizeCheck", withZeroSizeCheck ? ( "!" + secondVectorName + ".empty() && " ) : "" } } );
|
|
||||||
if ( i + 1 < cvm.second.size() )
|
|
||||||
{
|
|
||||||
assertions += "\n";
|
|
||||||
throws += "\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string const sizeCheckTemplate =
|
|
||||||
R"#(
|
|
||||||
#ifdef VULKAN_HPP_NO_EXCEPTIONS
|
#ifdef VULKAN_HPP_NO_EXCEPTIONS
|
||||||
${assertions}
|
${assertions}
|
||||||
#else
|
#else
|
||||||
@ -5114,8 +5107,7 @@ ${throws}
|
|||||||
#endif /*VULKAN_HPP_NO_EXCEPTIONS*/
|
#endif /*VULKAN_HPP_NO_EXCEPTIONS*/
|
||||||
)#";
|
)#";
|
||||||
|
|
||||||
str = replaceWithMap( sizeCheckTemplate, { { "assertions", assertions }, { "throws", throws } } );
|
str = replaceWithMap( sizeCheckTemplate, { { "assertions", assertions }, { "throws", throws } } );
|
||||||
}
|
|
||||||
|
|
||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
@ -6855,6 +6847,24 @@ bool VulkanHppGenerator::needsComplexBody( CommandData const & commandData ) con
|
|||||||
!generateProtection( commandData.feature, commandData.extensions ).first.empty();
|
!generateProtection( commandData.feature, commandData.extensions ).first.empty();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::pair<bool, std::map<size_t, std::vector<size_t>>>
|
||||||
|
VulkanHppGenerator::needsVectorSizeCheck( std::map<size_t, size_t> const & vectorParamIndices ) const
|
||||||
|
{
|
||||||
|
std::map<size_t, std::vector<size_t>> countToVectorMap;
|
||||||
|
for ( auto const & vpi : vectorParamIndices )
|
||||||
|
{
|
||||||
|
if ( vpi.second != INVALID_INDEX )
|
||||||
|
{
|
||||||
|
countToVectorMap[vpi.second].push_back( vpi.first );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return std::make_pair( std::find_if( countToVectorMap.begin(),
|
||||||
|
countToVectorMap.end(),
|
||||||
|
[]( auto const & cvm ) { return 1 < cvm.second.size(); } ) !=
|
||||||
|
countToVectorMap.end(),
|
||||||
|
countToVectorMap );
|
||||||
|
}
|
||||||
|
|
||||||
void VulkanHppGenerator::readBaseType( tinyxml2::XMLElement const * element,
|
void VulkanHppGenerator::readBaseType( tinyxml2::XMLElement const * element,
|
||||||
std::map<std::string, std::string> const & attributes )
|
std::map<std::string, std::string> const & attributes )
|
||||||
{
|
{
|
||||||
@ -10092,6 +10102,11 @@ int main( int argc, char ** argv )
|
|||||||
# else
|
# else
|
||||||
# define VULKAN_HPP_NOEXCEPT noexcept
|
# define VULKAN_HPP_NOEXCEPT noexcept
|
||||||
# define VULKAN_HPP_HAS_NOEXCEPT 1
|
# define VULKAN_HPP_HAS_NOEXCEPT 1
|
||||||
|
# if defined(VULKAN_HPP_NO_EXCEPTIONS)
|
||||||
|
# define VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS noexcept
|
||||||
|
# else
|
||||||
|
# define VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
||||||
|
# endif
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -628,9 +628,9 @@ private:
|
|||||||
std::string constructNoDiscardStandard( CommandData const & commandData ) const;
|
std::string constructNoDiscardStandard( CommandData const & commandData ) const;
|
||||||
std::string constructReturnType( CommandData const & commandData, std::string const & baseType ) const;
|
std::string constructReturnType( CommandData const & commandData, std::string const & baseType ) const;
|
||||||
std::string constructSuccessCodeList( std::vector<std::string> const & successCodes ) const;
|
std::string constructSuccessCodeList( std::vector<std::string> const & successCodes ) const;
|
||||||
std::string constructVectorSizeCheck( std::string const & name,
|
std::string constructVectorSizeCheck( std::string const & name,
|
||||||
CommandData const & commandData,
|
CommandData const & commandData,
|
||||||
std::map<size_t, size_t> const & vectorParamIndices ) const;
|
std::map<size_t, std::vector<size_t>> const & countToVectorMap ) const;
|
||||||
void checkCorrectness();
|
void checkCorrectness();
|
||||||
bool containsArray( std::string const & type ) const;
|
bool containsArray( std::string const & type ) const;
|
||||||
bool containsUnion( std::string const & type ) const;
|
bool containsUnion( std::string const & type ) const;
|
||||||
@ -664,6 +664,8 @@ private:
|
|||||||
bool isParamIndirect( std::string const & name, std::vector<ParamData> const & params ) const;
|
bool isParamIndirect( std::string const & name, std::vector<ParamData> const & params ) const;
|
||||||
bool isTwoStepAlgorithm( std::vector<ParamData> const & params ) const;
|
bool isTwoStepAlgorithm( std::vector<ParamData> const & params ) const;
|
||||||
bool needsComplexBody( CommandData const & commandData ) const;
|
bool needsComplexBody( CommandData const & commandData ) const;
|
||||||
|
std::pair<bool, std::map<size_t, std::vector<size_t>>>
|
||||||
|
needsVectorSizeCheck( std::map<size_t, size_t> const & vectorParamIndices ) const;
|
||||||
void readBaseType( tinyxml2::XMLElement const * element, std::map<std::string, std::string> const & attributes );
|
void readBaseType( tinyxml2::XMLElement const * element, std::map<std::string, std::string> const & attributes );
|
||||||
void readBitmask( tinyxml2::XMLElement const * element, std::map<std::string, std::string> const & attributes );
|
void readBitmask( tinyxml2::XMLElement const * element, std::map<std::string, std::string> const & attributes );
|
||||||
void readBitmaskAlias( tinyxml2::XMLElement const * element, std::map<std::string, std::string> const & attributes );
|
void readBitmaskAlias( tinyxml2::XMLElement const * element, std::map<std::string, std::string> const & attributes );
|
||||||
|
@ -174,6 +174,11 @@ static_assert( VK_HEADER_VERSION == 155, "Wrong VK_HEADER_VERSION!" );
|
|||||||
# else
|
# else
|
||||||
# define VULKAN_HPP_NOEXCEPT noexcept
|
# define VULKAN_HPP_NOEXCEPT noexcept
|
||||||
# define VULKAN_HPP_HAS_NOEXCEPT 1
|
# define VULKAN_HPP_HAS_NOEXCEPT 1
|
||||||
|
# if defined( VULKAN_HPP_NO_EXCEPTIONS )
|
||||||
|
# define VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS noexcept
|
||||||
|
# else
|
||||||
|
# define VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
||||||
|
# endif
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -37942,7 +37947,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & counterBufferOffsets
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & counterBufferOffsets
|
||||||
VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
|
VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
|
||||||
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const
|
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const
|
||||||
VULKAN_HPP_NOEXCEPT;
|
VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
||||||
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
|
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
|
||||||
|
|
||||||
template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
||||||
@ -38003,7 +38008,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_ASSIGNMENT,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
|
||||||
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
|
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
||||||
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
|
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
|
||||||
|
|
||||||
template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
||||||
@ -38017,7 +38022,8 @@ 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,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
|
||||||
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
|
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const
|
||||||
|
VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
||||||
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
|
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
|
||||||
|
|
||||||
template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
||||||
@ -38037,7 +38043,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
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_ASSIGNMENT,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
|
||||||
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
|
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
||||||
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
|
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
|
||||||
|
|
||||||
template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
||||||
@ -38100,7 +38106,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
void buildAccelerationStructureKHR(
|
void buildAccelerationStructureKHR(
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const & infos,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const & infos,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildOffsetInfoKHR * const> const & pOffsetInfos,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildOffsetInfoKHR * const> const & pOffsetInfos,
|
||||||
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
|
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
||||||
# endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
|
# endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
|
||||||
#endif /*VK_ENABLE_BETA_EXTENSIONS*/
|
#endif /*VK_ENABLE_BETA_EXTENSIONS*/
|
||||||
|
|
||||||
@ -38549,12 +38555,12 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
|
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
|
||||||
#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
|
#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
|
||||||
template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
||||||
void
|
void endTransformFeedbackEXT( uint32_t firstCounterBuffer,
|
||||||
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_ASSIGNMENT,
|
||||||
VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
|
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const
|
||||||
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
|
VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
||||||
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
|
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
|
||||||
|
|
||||||
template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
||||||
@ -55478,7 +55484,8 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
||||||
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,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::HdrMetadataEXT> const & metadata,
|
||||||
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
|
Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const
|
||||||
|
VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
|
||||||
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
|
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
|
||||||
|
|
||||||
template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
|
||||||
@ -89447,7 +89454,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint32_t firstCounterBuffer,
|
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,
|
||||||
Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
|
Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
||||||
{
|
{
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
||||||
VULKAN_HPP_ASSERT( counterBufferOffsets.empty() || counterBuffers.size() == counterBufferOffsets.size() );
|
VULKAN_HPP_ASSERT( counterBufferOffsets.empty() || counterBuffers.size() == counterBufferOffsets.size() );
|
||||||
@ -89576,7 +89583,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,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes,
|
||||||
Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
|
Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
||||||
{
|
{
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
||||||
VULKAN_HPP_ASSERT( buffers.size() == offsets.size() );
|
VULKAN_HPP_ASSERT( buffers.size() == offsets.size() );
|
||||||
@ -89623,7 +89630,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
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,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
|
||||||
Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
|
Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
||||||
{
|
{
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
||||||
VULKAN_HPP_ASSERT( buffers.size() == offsets.size() );
|
VULKAN_HPP_ASSERT( buffers.size() == offsets.size() );
|
||||||
@ -89669,7 +89676,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
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,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides,
|
||||||
Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
|
Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
||||||
{
|
{
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
||||||
VULKAN_HPP_ASSERT( buffers.size() == offsets.size() );
|
VULKAN_HPP_ASSERT( buffers.size() == offsets.size() );
|
||||||
@ -89816,7 +89823,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructureKHR(
|
VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructureKHR(
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const & infos,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const & infos,
|
||||||
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildOffsetInfoKHR * const> const & pOffsetInfos,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildOffsetInfoKHR * const> const & pOffsetInfos,
|
||||||
Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
|
Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
||||||
{
|
{
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
||||||
VULKAN_HPP_ASSERT( infos.size() == pOffsetInfos.size() );
|
VULKAN_HPP_ASSERT( infos.size() == pOffsetInfos.size() );
|
||||||
@ -90663,7 +90670,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint32_t firstCounterBuffer,
|
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,
|
||||||
Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
|
Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
||||||
{
|
{
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
||||||
VULKAN_HPP_ASSERT( counterBufferOffsets.empty() || counterBuffers.size() == counterBufferOffsets.size() );
|
VULKAN_HPP_ASSERT( counterBufferOffsets.empty() || counterBuffers.size() == counterBufferOffsets.size() );
|
||||||
@ -99847,7 +99854,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
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,
|
ArrayProxy<const VULKAN_HPP_NAMESPACE::HdrMetadataEXT> const & metadata,
|
||||||
Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
|
Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
|
||||||
{
|
{
|
||||||
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
# ifdef VULKAN_HPP_NO_EXCEPTIONS
|
||||||
VULKAN_HPP_ASSERT( swapchains.size() == metadata.size() );
|
VULKAN_HPP_ASSERT( swapchains.size() == metadata.size() );
|
||||||
|
Loading…
x
Reference in New Issue
Block a user