mewin/vulkan-hpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve alias handling of enums and structs: (#305)

Browse Source 
- Extend and unify alias handling on feature and extension enums
- Extend aliases of enums handling to accept two levels of aliasing
- Extend aliases of structures to allow mulitple aliases of the same structure
- Simplify forward declarations to just declare all structures and aliases
This commit is contained in:
Andreas Süßenbach
2019-03-18 20:48:10 +01:00
committed by Markus Tavenrath
parent cd8e5283c3
commit 48ceca69f3
3 changed files with 392 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
VulkanHppGenerator.hpp
View File

@@ -29,7 +29,6 @@ class VulkanHppGenerator
}
void checkCorrectness();
std::set<std::string> gatherForwardDeclarations();
std::string const& getTypesafeCheck() const;
std::string const& getVersion() const;
std::string const& getVulkanLicenseHeader() const;
@@ -46,7 +45,7 @@ class VulkanHppGenerator
void writeDispatchLoaderDynamic(std::ostream &os); // use vkGet*ProcAddress to get function pointers
void writeDispatchLoaderStatic(std::ostream &os); // use exported symbols from loader
void writeEnums(std::ostream & os) const;
void writeForwardDeclarations(std::ostream & os, std::set<std::string> const& forwardDeclarations) const;
void writeForwardDeclarations(std::ostream & os) const;
void writeHandles(std::ostream & os) const;
void writeHandlesCommandDefintions(std::ostream & os) const;
void writeResultExceptions(std::ostream & os) const;
@@ -142,7 +141,7 @@ class VulkanHppGenerator
std::vector<MemberData> members;
std::string protect;
std::vector<std::string> structExtends;
std::string alias;
std::vector<std::string> aliases;
std::string subStruct;
};
@@ -172,13 +171,12 @@ class VulkanHppGenerator
void readExtensionDisabledRequire(tinyxml2::XMLElement const* element);
void readExtensionRequire(tinyxml2::XMLElement const* element, std::string const& platform, std::string const& tag);
void readExtensionRequireCommand(tinyxml2::XMLElement const* element, std::string const& platform);
void readExtensionRequireEnum(tinyxml2::XMLElement const* element, std::string const& tag);
void readExtensionRequireType(tinyxml2::XMLElement const* element, std::string const& platform);
void readFeatureRequire(tinyxml2::XMLElement const* element);
void readFeatureRequireEnum(tinyxml2::XMLElement const* element);
void readFuncpointer(tinyxml2::XMLElement const* element, std::map<std::string, std::string> const& attributes);
void readHandle(tinyxml2::XMLElement const* element, std::map<std::string, std::string> const& attributes);
void readPlatform(tinyxml2::XMLElement const* element);
void readRequireEnum(tinyxml2::XMLElement const* element, std::string const& tag);
void readStruct(tinyxml2::XMLElement const* element, bool isUnion, std::map<std::string, std::string> const& attributes);
void readStructAlias(int lineNum, std::string const& name, std::string const& alias, std::map<std::string, std::string> const& attributes);
MemberData readStructMember(tinyxml2::XMLElement const* element);