mirror/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2024-10-14 16:32:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Reorganized alias handling of constants. (#1899)

Browse Source
This commit is contained in:
Andreas Süßenbach 2024-06-13 09:47:27 +02:00 committed by GitHub
parent 71031df10a
commit 235b1a2f85
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
VulkanHppGenerator.cpp
View File

@ -5091,7 +5091,7 @@ std::string VulkanHppGenerator::generateConstexprDefines() const
{ {
if ( !listedConstants.contains( constant ) ) if ( !listedConstants.contains( constant ) )
{ {
auto constIt = findByNameOrAlias( m_constants, constant ); auto constIt = m_constants.find( constant );
std::string tag = findTag( constant ); std::string tag = findTag( constant );
constants += replaceWithMap( constexprValueTemplate, constants += replaceWithMap( constexprValueTemplate,
{ { "type", constIt->second.type }, { { "type", constIt->second.type },
@ -5313,7 +5313,7 @@ std::string VulkanHppGenerator::generateConstexprUsings() const
{ {
if ( !listedConstants.contains( constant ) ) if ( !listedConstants.contains( constant ) )
{ {
assert( findByNameOrAlias( m_constants, constant ) != m_constants.end() ); assert( m_constants.find( constant ) != m_constants.end() );
std::string tag = findTag( constant ); std::string tag = findTag( constant );
constants += replaceWithMap( constexprUsingTemplate, { { "constName", stripPrefix( toCamelCase( stripPostfix( constant, tag ) ), "Vk" ) + tag } } ); constants += replaceWithMap( constexprUsingTemplate, { { "constName", stripPrefix( toCamelCase( stripPostfix( constant, tag ) ), "Vk" ) + tag } } );
listedConstants.insert( constant ); listedConstants.insert( constant );
@ -13266,25 +13266,35 @@ void VulkanHppGenerator::readEnumsConstants( tinyxml2::XMLElement const * elemen
std::map<std::string, std::string> attributes = getAttributes( element ); std::map<std::string, std::string> attributes = getAttributes( element );
checkElements( line, getChildElements( element ), {} ); checkElements( line, getChildElements( element ), {} );
auto aliasIt = attributes.find( "alias" ); std::string name, type, value;
auto aliasIt = attributes.find( "alias" );
if ( aliasIt != attributes.end() ) if ( aliasIt != attributes.end() )
{ {
checkAttributes( line, attributes, { { "alias", {} }, { "name", {} } }, {} ); checkAttributes( line, attributes, { { "alias", {} }, { "name", {} } }, {} );
std::string alias = aliasIt->second; std::string alias;
std::string name = attributes.find( "name" )->second; for ( auto const & attribute : attributes )
{
if ( attribute.first == "alias" )
{
alias = attribute.second;
}
else if ( attribute.first == "name" )
{
name = attribute.second;
checkForError( !m_constants.contains( name ), line, "already specified enum constant <" + name + ">" );
}
}
auto constIt = m_constants.find( alias ); auto constIt = m_constants.find( alias );
checkForError( constIt != m_constants.end(), line, "constant alias <" + name + "> is an alias of an unknown constant <" + alias + ">." ); checkForError( constIt != m_constants.end(), line, "constant alias <" + name + "> is an alias of an unknown constant <" + alias + ">." );
checkForError( constIt->second.aliases.insert( { name, line } ).second, line, "constant alias <" + name + "> already listed for constant <" + alias + ">" ); type = constIt->second.type;
checkForError( m_types.insert( { name, TypeData{ TypeCategory::Constant, {}, line } } ).second, line, "enum <" + name + "> already specified" ); value = constIt->second.value;
} }
else else
{ {
// checkAttributes( line, attributes, { { "name", {} }, { "value", {} } }, { { "type", {} }, { "comment", {} } } );
checkAttributes( line, attributes, { { "name", {} }, { "type", {} }, { "value", {} } }, { { "comment", {} } } ); checkAttributes( line, attributes, { { "name", {} }, { "type", {} }, { "value", {} } }, { { "comment", {} } } );
std::string alias, name, type, value;
for ( auto const & attribute : attributes ) for ( auto const & attribute : attributes )
{ {
if ( attribute.first == "name" ) if ( attribute.first == "name" )
@ -13301,11 +13311,9 @@ void VulkanHppGenerator::readEnumsConstants( tinyxml2::XMLElement const * elemen
value = attribute.second; value = attribute.second;
} }
} }
checkForError( m_types.insert( { name, TypeData{ TypeCategory::Constant, {}, line } } ).second, line, "enum <" + name + "> already specified" );
assert( !m_constants.contains( name ) );
m_constants[name] = { {}, type, value, line };
} }
checkForError( m_types.insert( { name, TypeData{ TypeCategory::Constant, {}, line } } ).second, line, "enum <" + name + "> already specified" );
m_constants[name] = { type, value, line };
} }
void VulkanHppGenerator::readEnumsEnum( tinyxml2::XMLElement const * element, std::map<std::string, EnumData>::iterator enumIt ) void VulkanHppGenerator::readEnumsEnum( tinyxml2::XMLElement const * element, std::map<std::string, EnumData>::iterator enumIt )
@ -14141,11 +14149,13 @@ void VulkanHppGenerator::readRequireEnum(
checkForError( checkForError(
m_types.insert( { name, TypeData{ TypeCategory::Constant, { requiredBy }, line } } ).second, line, "required enum <" + name + "> already specified" ); m_types.insert( { name, TypeData{ TypeCategory::Constant, { requiredBy }, line } } ).second, line, "required enum <" + name + "> already specified" );
// if that constant is a uint32_t, it's stored in m_constants (I think, this doesn't happen at all!!)
auto constIt = m_constants.find( alias ); auto constIt = m_constants.find( alias );
if ( constIt != m_constants.end() ) if ( constIt != m_constants.end() )
{ {
checkForError( constIt->second.aliases.insert( { name, line } ).second, line, "enum alias <" + name + "> already listed for enum <" + alias + ">" ); typeIt = m_types.find( name );
typeIt->second.requiredBy.insert( requiredBy );
m_constants[name] = { constIt->second.type, constIt->second.value, line };
requireData.constants.push_back( name );
} }
} }
else else
@ -14232,7 +14242,7 @@ void VulkanHppGenerator::readRequireEnum(
if ( type == "uint32_t" ) if ( type == "uint32_t" )
{ {
assert( !m_constants.contains( name ) ); assert( !m_constants.contains( name ) );
m_constants[name] = { {}, type, value, line }; m_constants[name] = { type, value, line };
} }
} }

1
VulkanHppGenerator.hpp
View File

@ -200,7 +200,6 @@ private:
struct ConstantData struct ConstantData
{ {
std::map<std::string, int> aliases = {};
std::string type = {}; std::string type = {};
std::string value = {}; std::string value = {};
int xmlLine = {}; int xmlLine = {};