TheCloud/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2025-09-16 07:23:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1128 from asuessenbach/version

Browse Source 
Check for "VK_API_VERSION_m_n" or "VK_VERSION_m_n" in SPIRVCapabilities and SPIRVExtensions
This commit is contained in:
Andreas Süßenbach 2021-11-09 11:04:29 +01:00 committed by GitHub
commit f352a3efd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
VulkanHppGenerator.cpp
View File

@ -13329,11 +13329,14 @@ void VulkanHppGenerator::readSPIRVCapabilitiesSPIRVCapabilityEnableVersion(
for ( auto const & attribute : attributes ) for ( auto const & attribute : attributes )
{ {
assert( attribute.first == "version" ); assert( attribute.first == "version" );
check( beginsWith( attribute.second, "VK_API_VERSION_" ), std::string feature = attribute.second;
if ( beginsWith( feature, "VK_API_" ) )
{
feature.erase( 3, 4 ); // remove "API_" from the version -> VK_VERSION_x_y
}
check( beginsWith( feature, "VK_VERSION_" ),
xmlLine, xmlLine,
"unknown version <" + attribute.second + "> specified for SPIR-V capability" ); "unknown version <" + attribute.second + "> specified for SPIR-V capability" );
std::string feature = attribute.second;
feature.erase( 3, 4 ); // remove "API_" from the version -> VK_VERSION_x_y
check( m_features.find( feature ) != m_features.end(), check( m_features.find( feature ) != m_features.end(),
xmlLine, xmlLine,
"unknown version <" + attribute.second + "> specified for SPIR-V capability" ); "unknown version <" + attribute.second + "> specified for SPIR-V capability" );
@ -13389,11 +13392,14 @@ void VulkanHppGenerator::readSPIRVExtensionsExtensionEnable( tinyxml2::XMLElemen
else else
{ {
assert( attribute.first == "version" ); assert( attribute.first == "version" );
check( beginsWith( attribute.second, "VK_API_VERSION_" ), std::string feature = attribute.second;
if ( beginsWith( feature, "VK_API_" ) )
{
feature.erase( 3, 4 ); // remove "API_" from the version -> VK_VERSION_x_y
}
check( beginsWith( feature, "VK_VERSION_" ),
line, line,
"unknown version <" + attribute.second + "> specified for SPIR-V extension" ); "unknown version <" + attribute.second + "> specified for SPIR-V extension" );
std::string feature = attribute.second;
feature.erase( 3, 4 ); // remove "API_" from the version -> VK_VERSION_x_y
check( m_features.find( feature ) != m_features.end(), check( m_features.find( feature ) != m_features.end(),
line, line,
"unknown version <" + attribute.second + "> specified for SPIR-V extension" ); "unknown version <" + attribute.second + "> specified for SPIR-V extension" );