AuroraMiddleware/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp synced 2024-11-25 21:40:04 +00:00
Code Issues Releases Wiki Activity

Merge pull request #22 from mtavenrath/scopedEnums

Browse Source 
Add scoped enums for flags without enum values to ensure type safety …
This commit is contained in:
asuessenbach 2016-02-19 15:56:28 +01:00
commit fc74dc9214
2 changed files with 2521 additions and 1617 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
VkCppGenerator.cpp
View File

@ -276,7 +276,7 @@ void readExtensionRequire( tinyxml2::XMLElement * element, std::vector<std::stri
void readExtensions( tinyxml2::XMLElement * element, std::vector<ExtensionData> & extensions, std::map<std::string, EnumData> & enums ); void readExtensions( tinyxml2::XMLElement * element, std::vector<ExtensionData> & extensions, std::map<std::string, EnumData> & enums );
void readExtensionsExtension(tinyxml2::XMLElement * element, std::vector<ExtensionData> & extensions, std::map<std::string, EnumData> & enums); void readExtensionsExtension(tinyxml2::XMLElement * element, std::vector<ExtensionData> & extensions, std::map<std::string, EnumData> & enums);
void readTypeBasetype( tinyxml2::XMLElement * element, std::list<DependencyData> & dependencies ); void readTypeBasetype( tinyxml2::XMLElement * element, std::list<DependencyData> & dependencies );
void readTypeBitmask( tinyxml2::XMLElement * element, std::list<DependencyData> & dependencies, std::set<std::string> & flags, std::set<std::string> & vkTypes ); void readTypeBitmask( tinyxml2::XMLElement * element, std::list<DependencyData> & dependencies, std::set<std::string> & flags, std::set<std::string> & vkTypes, std::map<std::string, EnumData> & enums);
void readTypeDefine( tinyxml2::XMLElement * element, std::string & version ); void readTypeDefine( tinyxml2::XMLElement * element, std::string & version );
void readTypeFuncpointer( tinyxml2::XMLElement * element, std::list<DependencyData> & dependencies ); void readTypeFuncpointer( tinyxml2::XMLElement * element, std::list<DependencyData> & dependencies );
void readTypeHandle( tinyxml2::XMLElement * element, std::list<DependencyData> & dependencies ); void readTypeHandle( tinyxml2::XMLElement * element, std::list<DependencyData> & dependencies );
@ -284,7 +284,7 @@ void readTypeStruct( tinyxml2::XMLElement * element, std::list<DependencyData> &
void readTypeStructMember( tinyxml2::XMLElement * element, std::vector<MemberData> & members, std::set<std::string> & dependencies ); void readTypeStructMember( tinyxml2::XMLElement * element, std::vector<MemberData> & members, std::set<std::string> & dependencies );
void readTypeUnion( tinyxml2::XMLElement * element, std::list<DependencyData> & dependencies, std::map<std::string,StructData> & structs, std::set<std::string> & vkTypes ); void readTypeUnion( tinyxml2::XMLElement * element, std::list<DependencyData> & dependencies, std::map<std::string,StructData> & structs, std::set<std::string> & vkTypes );
void readTypeUnionMember( tinyxml2::XMLElement * element, std::vector<MemberData> & members, std::set<std::string> & dependencies ); void readTypeUnionMember( tinyxml2::XMLElement * element, std::vector<MemberData> & members, std::set<std::string> & dependencies );
void readTypes( tinyxml2::XMLElement * element, std::string & version, std::list<DependencyData> & dependencies, std::set<std::string> & flags, std::map<std::string,StructData> & structs, std::set<std::string> & vkTypes ); void readTypes( tinyxml2::XMLElement * element, std::string & version, std::list<DependencyData> & dependencies, std::set<std::string> & flags, std::map<std::string,StructData> & structs, std::set<std::string> & vkTypes, std::map<std::string, EnumData> & enums);
void sortDependencies( std::list<DependencyData> & dependencies, std::vector<ExtensionData> const& extensions, std::vector<std::vector<DependencyData>> & sortedDependencies ); void sortDependencies( std::list<DependencyData> & dependencies, std::vector<ExtensionData> const& extensions, std::vector<std::vector<DependencyData>> & sortedDependencies );
std::string reduceName(std::string const& name); std::string reduceName(std::string const& name);
std::string strip( std::string const& value, std::string const& prefix ); std::string strip( std::string const& value, std::string const& prefix );
@ -333,8 +333,18 @@ void createDefaults( std::vector<DependencyData> const& dependencies, std::map<s
case DependencyData::Category::COMMAND : // commands should never be asked for defaults case DependencyData::Category::COMMAND : // commands should never be asked for defaults
break; break;
case DependencyData::Category::ENUM : case DependencyData::Category::ENUM :
assert( enums.find( it->name ) != enums.end() ); {
defaultValues[it->name] = it->name + "::" + enums.find( it->name )->second.members.front().name; assert(enums.find(it->name) != enums.end());
EnumData const & enumData = enums.find(it->name)->second;
if (!enumData.members.empty())
{
defaultValues[it->name] = it->name + "::" + enums.find(it->name)->second.members.front().name;
}
else
{
defaultValues[it->name] = it->name + "()";
}
}
break; break;
case DependencyData::Category::FLAGS : case DependencyData::Category::FLAGS :
case DependencyData::Category::STRUCT : case DependencyData::Category::STRUCT :
@ -704,7 +714,7 @@ void readTypeBasetype( tinyxml2::XMLElement * element, std::list<DependencyData>
} }
} }
void readTypeBitmask( tinyxml2::XMLElement * element, std::list<DependencyData> & dependencies, std::set<std::string> & flags, std::set<std::string> & vkTypes ) void readTypeBitmask( tinyxml2::XMLElement * element, std::list<DependencyData> & dependencies, std::set<std::string> & flags, std::set<std::string> & vkTypes, std::map<std::string, EnumData> & enums)
{ {
tinyxml2::XMLElement * typeElement = element->FirstChildElement(); tinyxml2::XMLElement * typeElement = element->FirstChildElement();
assert( typeElement && ( strcmp( typeElement->Value(), "type" ) == 0 ) && typeElement->GetText() && ( strcmp( typeElement->GetText(), "VkFlags" ) == 0 ) ); assert( typeElement && ( strcmp( typeElement->Value(), "type" ) == 0 ) && typeElement->GetText() && ( strcmp( typeElement->GetText(), "VkFlags" ) == 0 ) );
@ -716,21 +726,30 @@ void readTypeBitmask( tinyxml2::XMLElement * element, std::list<DependencyData>
assert( !nameElement->NextSiblingElement() ); assert( !nameElement->NextSiblingElement() );
if ( element->Attribute( "requires" ) ) std::string requires;
if (element->Attribute("requires"))
{ {
std::string requires = strip( element->Attribute( "requires" ), "Vk" ); requires = strip(element->Attribute("requires"), "Vk");
dependencies.push_back( DependencyData( DependencyData::Category::FLAGS, name ) ); }
dependencies.back().dependencies.insert( requires ); else {
flags.insert( name ); // Generate FlagBits name
requires = name;
size_t pos = requires.find_last_of("Flags");
assert(pos != std::string::npos);
requires.replace(pos, 5, "FlagBits");
assert( vkTypes.find( name ) == vkTypes.end() ); dependencies.push_back(DependencyData(DependencyData::Category::ENUM, requires));
vkTypes.insert( name ); std::map<std::string, EnumData>::iterator it = enums.insert(std::make_pair(requires, EnumData())).first;
} it->second.bitmask = true;
else vkTypes.insert(requires);
{
dependencies.push_back( DependencyData( DependencyData::Category::SCALAR, name ) );
dependencies.back().dependencies.insert( type );
} }
dependencies.push_back( DependencyData( DependencyData::Category::FLAGS, name ) );
dependencies.back().dependencies.insert( requires );
flags.insert( name );
assert( vkTypes.find( name ) == vkTypes.end() );
vkTypes.insert( name );
} }
void readTypeDefine( tinyxml2::XMLElement * element, std::string & version ) void readTypeDefine( tinyxml2::XMLElement * element, std::string & version )
@ -969,7 +988,7 @@ void readTypeUnion( tinyxml2::XMLElement * element, std::list<DependencyData> &
vkTypes.insert( name ); vkTypes.insert( name );
} }
void readTypes( tinyxml2::XMLElement * element, std::string & version, std::list<DependencyData> & dependencies, std::set<std::string> & flags, std::map<std::string,StructData> & structs, std::set<std::string> & vkTypes ) void readTypes( tinyxml2::XMLElement * element, std::string & version, std::list<DependencyData> & dependencies, std::set<std::string> & flags, std::map<std::string,StructData> & structs, std::set<std::string> & vkTypes, std::map<std::string, EnumData> & enums)
{ {
tinyxml2::XMLElement * child = element->FirstChildElement(); tinyxml2::XMLElement * child = element->FirstChildElement();
do do
@ -986,7 +1005,7 @@ void readTypes( tinyxml2::XMLElement * element, std::string & version, std::list
} }
else if ( category == "bitmask" ) else if ( category == "bitmask" )
{ {
readTypeBitmask( child, dependencies, flags, vkTypes ); readTypeBitmask( child, dependencies, flags, vkTypes, enums );
} }
else if ( category == "define" ) else if ( category == "define" )
{ {
@ -1933,7 +1952,7 @@ int main( int argc, char **argv )
} }
else if ( value == "types" ) else if ( value == "types" )
{ {
readTypes( child, version, dependencies, flags, structs, vkTypes ); readTypes( child, version, dependencies, flags, structs, vkTypes, enums );
} }
else else
{ {
@ -1978,6 +1997,8 @@ int main( int argc, char **argv )
<< std::endl; << std::endl;
} }
writeTypes( ofs, sortedDependencies[i], commands, enums, structs, defaultValues, vkTypes ); writeTypes( ofs, sortedDependencies[i], commands, enums, structs, defaultValues, vkTypes );
writeEnumsToString(ofs, sortedDependencies[i], enums);
if ( ( 0 < i ) && !extensions[i-1].protect.empty() ) if ( ( 0 < i ) && !extensions[i-1].protect.empty() )
{ {
ofs << "#endif /* " << extensions[i-1].protect << " */" << std::endl ofs << "#endif /* " << extensions[i-1].protect << " */" << std::endl
@ -1985,10 +2006,5 @@ int main( int argc, char **argv )
} }
} }
for (size_t i = 0; i < sortedDependencies.size(); i++)
{
writeEnumsToString(ofs, sortedDependencies[i], enums);
}
ofs << "}" << std::endl; ofs << "}" << std::endl;
} }

4072
vulkan/vk_cpp.h
View File

File diff suppressed because it is too large Load Diff