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

Merge pull request #104 from asuessenbach/misc

Browse Source 
some adjustments:

to_string of empty enums return "(void)", instead of empty string
to_string of undefined enum value return "invalid", instead of "unknown"
to_string of Flags of empty Enums or Flags with no bit set return "{}", instead of empty string
to_string of Flags embraces the flags with "{", "}"
all typedefs are replaced with using expressions
This commit is contained in:
Markus Tavenrath 2016-05-02 17:25:31 +02:00
commit ecb56f0632
2 changed files with 301 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
VkCppGenerator.cpp
View File

@ -2490,7 +2490,7 @@ void writeEnumsToString(std::ofstream & ofs, DependencyData const& dependencyDat
<< " {" << std::endl;
if (enumData.members.empty())
{
ofs << " return std::string();" << std::endl;
ofs << " return \"(void)\";" << std::endl;
}
else
{
@ -2500,7 +2500,7 @@ void writeEnumsToString(std::ofstream & ofs, DependencyData const& dependencyDat
{
ofs << " case " << dependencyData.name << "::" << itMember->name << ": return \"" << itMember->name.substr(1) << "\";" << std::endl;
}
ofs << " default: return \"unknown\";" << std::endl
ofs << " default: return \"invalid\";" << std::endl
<< " }" << std::endl;
}
ofs << " }" << std::endl;
@ -2516,18 +2516,18 @@ void writeFlagsToString(std::ofstream & ofs, DependencyData const& dependencyDat
<< " {" << std::endl;
if (enumData.members.empty())
{
ofs << " return std::string();" << std::endl;
ofs << " return \"{}\";" << std::endl;
}
else
{
ofs << " if (!value) return std::string();" << std::endl
ofs << " if (!value) return \"{}\";" << std::endl
<< " std::string result;" << std::endl;
for (auto itMember = enumData.members.begin(); itMember != enumData.members.end(); ++itMember)
{
ofs << " if (value & " << enumPrefix + itMember->name << ") result += \"" << itMember->name.substr(1) << " | \";" << std::endl;
}
ofs << " return result.substr(0, result.size() - 3);" << std::endl;
ofs << " return \"{\" + result.substr(0, result.size() - 3) + \"}\";" << std::endl;
}
ofs << " }" << std::endl;
leaveProtect(ofs, enumData.protect);
@ -2555,7 +2555,7 @@ void writeTypeFlags( std::ofstream & ofs, DependencyData const& dependencyData,
{
assert( dependencyData.dependencies.size() == 1 );
enterProtect(ofs, flagData.protect);
ofs << " typedef Flags<" << *dependencyData.dependencies.begin() << ", Vk" << dependencyData.name << "> " << dependencyData.name << ";" << std::endl
ofs << " using " << dependencyData.name << " = Flags<" << *dependencyData.dependencies.begin() << ", Vk" << dependencyData.name << ">;" << std::endl
<< std::endl
<< " inline " << dependencyData.name << " operator|( " << *dependencyData.dependencies.begin() << " bit0, " << *dependencyData.dependencies.begin() << " bit1 )" << std::endl
<< " {" << std::endl
@ -2584,6 +2584,7 @@ void writeTypeHandle(std::ofstream & ofs, VkData const& vkData, DependencyData c
<< " : m_" << memberName << "(" << memberName << ")" << std::endl
<< " {}" << std::endl
<< std::endl
// assignment from native handle
<< " " << dependencyData.name << "& operator=(Vk" << dependencyData.name << " " << memberName << ")" << std::endl
<< " {" << std::endl
<< " m_" << memberName << " = " << memberName << ";" << std::endl
@ -2657,7 +2658,8 @@ void writeTypeHandle(std::ofstream & ofs, VkData const& vkData, DependencyData c
void writeTypeScalar( std::ofstream & ofs, DependencyData const& dependencyData )
{
assert( dependencyData.dependencies.size() == 1 );
ofs << " typedef " << *dependencyData.dependencies.begin() << " " << dependencyData.name << ";" << std::endl;
ofs << " using " << dependencyData.name << " = " << *dependencyData.dependencies.begin() << ";" << std::endl
<< std::endl;
}
void writeTypeStruct( std::ofstream & ofs, VkData const& vkData, DependencyData const& dependencyData, std::map<std::string,std::string> const& defaultValues )

581
vulkan/vk_cpp.hpp
View File

File diff suppressed because it is too large Load Diff