mirror of
https://github.com/KhronosGroup/Vulkan-Hpp.git
synced 2024-10-14 16:32:17 +00:00
List out default ctor parameters in separate lines
It's often useful to browse through vulkan.hpp to check what the default values for various info structs are, but having them on a single line makes it hard to read. This change puts each ctor argument on a different line, which makes the default values more visible.
This commit is contained in:
parent
3f9ca5433a
commit
c565366839
@ -3996,11 +3996,14 @@ void VulkanHppGenerator::writeResultEnum(std::ostream & os)
|
|||||||
void VulkanHppGenerator::writeStructConstructor(std::ostream & os, std::string const& name, StructData const& structData, std::map<std::string, std::string> const& defaultValues)
|
void VulkanHppGenerator::writeStructConstructor(std::ostream & os, std::string const& name, StructData const& structData, std::map<std::string, std::string> const& defaultValues)
|
||||||
{
|
{
|
||||||
// the constructor with all the elements as arguments, with defaults
|
// the constructor with all the elements as arguments, with defaults
|
||||||
os << " " << name << "( ";
|
std::string ctorOpening = " " + name + "( ";
|
||||||
|
size_t indentSize = ctorOpening.size();
|
||||||
|
os << ctorOpening;
|
||||||
|
|
||||||
bool listedArgument = false;
|
bool listedArgument = false;
|
||||||
for (size_t i = 0; i < structData.members.size(); i++)
|
for (size_t i = 0; i < structData.members.size(); i++)
|
||||||
{
|
{
|
||||||
listedArgument = writeStructConstructorArgument(os, listedArgument, structData.members[i], defaultValues);
|
listedArgument = writeStructConstructorArgument(os, listedArgument, indentSize, structData.members[i], defaultValues);
|
||||||
}
|
}
|
||||||
os << " )" << std::endl;
|
os << " )" << std::endl;
|
||||||
|
|
||||||
@ -4045,11 +4048,16 @@ void VulkanHppGenerator::writeStructConstructor(std::ostream & os, std::string c
|
|||||||
assert(subStruct != m_structs.end());
|
assert(subStruct != m_structs.end());
|
||||||
|
|
||||||
std::string subStructArgumentName = startLowerCase(strip(subStruct->first, "vk"));
|
std::string subStructArgumentName = startLowerCase(strip(subStruct->first, "vk"));
|
||||||
|
std::string ctorOpening = " explicit " + name + "( ";
|
||||||
|
size_t indentSize = ctorOpening.size();
|
||||||
|
|
||||||
|
os << ctorOpening << subStruct->first << " const& " << subStructArgumentName;
|
||||||
|
os << ",\n";
|
||||||
|
writeIndentation(os, indentSize);
|
||||||
|
|
||||||
os << " explicit " << name << "( " << subStruct->first << " const& " << subStructArgumentName;
|
|
||||||
for (size_t i = subStruct->second.members.size(); i < structData.members.size(); i++)
|
for (size_t i = subStruct->second.members.size(); i < structData.members.size(); i++)
|
||||||
{
|
{
|
||||||
writeStructConstructorArgument(os, true, structData.members[i], defaultValues);
|
writeStructConstructorArgument(os, true, indentSize, structData.members[i], defaultValues);
|
||||||
}
|
}
|
||||||
os << " )" << std::endl;
|
os << " )" << std::endl;
|
||||||
|
|
||||||
@ -4092,12 +4100,22 @@ void VulkanHppGenerator::writeStructConstructor(std::ostream & os, std::string c
|
|||||||
os << replaceWithMap(templateString, { { "name", name } });
|
os << replaceWithMap(templateString, { { "name", name } });
|
||||||
}
|
}
|
||||||
|
|
||||||
bool VulkanHppGenerator::writeStructConstructorArgument(std::ostream & os, bool listedArgument, MemberData const& memberData, std::map<std::string, std::string> const& defaultValues)
|
void VulkanHppGenerator::writeIndentation(std::ostream & os, size_t indentLength)
|
||||||
|
{
|
||||||
|
for(size_t i = 0; i < indentLength; i++)
|
||||||
|
{
|
||||||
|
os << " ";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool VulkanHppGenerator::writeStructConstructorArgument(std::ostream & os, bool listedArgument, size_t indentLength, MemberData const& memberData, std::map<std::string, std::string> const& defaultValues)
|
||||||
{
|
{
|
||||||
if (listedArgument)
|
if (listedArgument)
|
||||||
{
|
{
|
||||||
os << ", ";
|
os << ",\n";
|
||||||
|
writeIndentation(os, indentLength);
|
||||||
}
|
}
|
||||||
|
|
||||||
// skip members 'pNext' and 'sType', as they are never explicitly set
|
// skip members 'pNext' and 'sType', as they are never explicitly set
|
||||||
if ((memberData.name != "pNext") && (memberData.name != "sType"))
|
if ((memberData.name != "pNext") && (memberData.name != "sType"))
|
||||||
{
|
{
|
||||||
|
@ -270,8 +270,9 @@ class VulkanHppGenerator
|
|||||||
void writeFunctionHeaderArgumentsStandard(std::ostream & os, CommandData const& commandData, bool withDefaults);
|
void writeFunctionHeaderArgumentsStandard(std::ostream & os, CommandData const& commandData, bool withDefaults);
|
||||||
void writeFunctionHeaderReturnType(std::ostream & os, std::string const& indentation, CommandData const& commandData, bool enhanced, bool singular, bool unique, bool isStructureChain);
|
void writeFunctionHeaderReturnType(std::ostream & os, std::string const& indentation, CommandData const& commandData, bool enhanced, bool singular, bool unique, bool isStructureChain);
|
||||||
void writeFunctionHeaderTemplate(std::ostream & os, std::string const& indentation, CommandData const& commandData, bool enhanced, bool unique, bool withDefault, bool isStructureChain);
|
void writeFunctionHeaderTemplate(std::ostream & os, std::string const& indentation, CommandData const& commandData, bool enhanced, bool unique, bool withDefault, bool isStructureChain);
|
||||||
|
void writeIndentation(std::ostream & os, size_t indentLength);
|
||||||
void writeStructConstructor(std::ostream & os, std::string const& name, StructData const& structData, std::map<std::string, std::string> const& defaultValues);
|
void writeStructConstructor(std::ostream & os, std::string const& name, StructData const& structData, std::map<std::string, std::string> const& defaultValues);
|
||||||
bool writeStructConstructorArgument(std::ostream & os, bool listedArgument, MemberData const& memberData, std::map<std::string, std::string> const& defaultValues);
|
bool writeStructConstructorArgument(std::ostream & os, bool listedArgument, size_t indentLength, MemberData const& memberData, std::map<std::string, std::string> const& defaultValues);
|
||||||
void writeStructSetter(std::ostream & os, std::string const& structureName, MemberData const& memberData);
|
void writeStructSetter(std::ostream & os, std::string const& structureName, MemberData const& memberData);
|
||||||
void writeStructureChainValidation(std::ostream & os, DependencyData const& dependencyData);
|
void writeStructureChainValidation(std::ostream & os, DependencyData const& dependencyData);
|
||||||
void writeThrowExceptions(std::ostream& os, EnumData const& enumData);
|
void writeThrowExceptions(std::ostream& os, EnumData const& enumData);
|
||||||
|
1163
vulkan/vulkan.hpp
1163
vulkan/vulkan.hpp
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user