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

Remove constructors for "returnedonly" structures; introduce member inialization for pNext and sType, instead. (#168)

Browse Source
This commit is contained in:
Andreas Süßenbach 2018-01-05 09:25:38 +01:00 committed by Markus Tavenrath
parent c4fcc08e95
commit c548ea4bf2
2 changed files with 628 additions and 1832 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
VulkanHppGenerator.cpp
View File

@ -3954,43 +3954,40 @@ void VulkanHppGenerator::writeStructConstructor(std::ostream & os, std::string c
// the constructor with all the elements as arguments, with defaults // the constructor with all the elements as arguments, with defaults
os << " " << name << "( "; os << " " << name << "( ";
bool listedArgument = false; bool listedArgument = false;
if (!structData.returnedOnly) for (size_t i = 0; i < structData.members.size(); i++)
{ {
for (size_t i = 0; i < structData.members.size(); i++) if (listedArgument)
{ {
if (listedArgument) os << ", ";
{ }
os << ", "; // skip members 'pNext' and 'sType', as they are never explicitly set
} if ((structData.members[i].name != "pNext") && (structData.members[i].name != "sType"))
// skip members 'pNext' and 'sType', as they are never explicitly set {
if ((structData.members[i].name != "pNext") && (structData.members[i].name != "sType")) // find a default value for the given pure type
{ std::map<std::string, std::string>::const_iterator defaultIt = defaultValues.find(structData.members[i].pureType);
// find a default value for the given pure type assert(defaultIt != defaultValues.end());
std::map<std::string, std::string>::const_iterator defaultIt = defaultValues.find(structData.members[i].pureType);
assert(defaultIt != defaultValues.end());
if (structData.members[i].arraySize.empty()) if (structData.members[i].arraySize.empty())
{ {
// the arguments name get a trailing '_', to distinguish them from the actual struct members // the arguments name get a trailing '_', to distinguish them from the actual struct members
// pointer arguments get a nullptr as default // pointer arguments get a nullptr as default
os << structData.members[i].type << " " << structData.members[i].name << "_ = " << (structData.members[i].type.back() == '*' ? "nullptr" : defaultIt->second); os << structData.members[i].type << " " << structData.members[i].name << "_ = " << (structData.members[i].type.back() == '*' ? "nullptr" : defaultIt->second);
}
else
{
// array members are provided as const reference to a std::array
// the arguments name get a trailing '_', to distinguish them from the actual struct members
// list as many default values as there are elements in the array
os << "std::array<" << structData.members[i].type << "," << structData.members[i].arraySize << "> const& " << structData.members[i].name << "_ = { { " << defaultIt->second;
size_t n = atoi(structData.members[i].arraySize.c_str());
assert(0 < n);
for (size_t j = 1; j < n; j++)
{
os << ", " << defaultIt->second;
}
os << " } }";
}
listedArgument = true;
} }
else
{
// array members are provided as const reference to a std::array
// the arguments name get a trailing '_', to distinguish them from the actual struct members
// list as many default values as there are elements in the array
os << "std::array<" << structData.members[i].type << "," << structData.members[i].arraySize << "> const& " << structData.members[i].name << "_ = { { " << defaultIt->second;
size_t n = atoi(structData.members[i].arraySize.c_str());
assert(0 < n);
for (size_t j = 1; j < n; j++)
{
os << ", " << defaultIt->second;
}
os << " } }";
}
listedArgument = true;
} }
} }
os << " )" << std::endl; os << " )" << std::endl;
@ -3999,38 +3996,15 @@ void VulkanHppGenerator::writeStructConstructor(std::ostream & os, std::string c
bool firstArgument = true; bool firstArgument = true;
for (size_t i = 0; i < structData.members.size(); i++) for (size_t i = 0; i < structData.members.size(); i++)
{ {
if (structData.members[i].arraySize.empty()) // skip members 'pNext' and 'sType' are directly set by initializers
if ((structData.members[i].name != "pNext") && (structData.members[i].name != "sType") && (structData.members[i].arraySize.empty()))
{ {
// here, we can only handle non-array arguments // here, we can only handle non-array arguments
std::string templateString = " ${sep} ${member}( ${value} )\n"; std::string templateString = " ${sep} ${member}( ${value} )\n";
std::string sep = firstArgument ? ":" : ","; std::string sep = firstArgument ? ":" : ",";
std::string member = structData.members[i].name; std::string member = structData.members[i].name;
std::string value; std::string value = structData.members[i].name + "_"; // the elements are initialized by the corresponding argument (with trailing '_', as mentioned above)
// 'pNext' and 'sType' don't get an argument, use nullptr and the correct StructureType enum value to initialize them
if (structData.members[i].name == "pNext")
{
value = "nullptr";
}
else if (structData.members[i].name == "sType")
{
assert(!structData.members[i].values.empty());
auto nameIt = m_nameMap.find(structData.members[i].values);
assert(nameIt != m_nameMap.end());
value = nameIt->second;
}
else
{
if (!structData.returnedOnly)
{
// the other elements are initialized by the corresponding argument (with trailing '_', as mentioned above)
value = structData.members[i].name + "_";
}
else
{
templateString = "";
}
}
os << replaceWithMap(templateString, { { "sep", sep },{ "member", member },{ "value", value } }); os << replaceWithMap(templateString, { { "sep", sep },{ "member", member },{ "value", value } });
firstArgument = false; firstArgument = false;
} }
@ -4038,20 +4012,17 @@ void VulkanHppGenerator::writeStructConstructor(std::ostream & os, std::string c
// the body of the constructor, copying over data from argument list into wrapped struct // the body of the constructor, copying over data from argument list into wrapped struct
os << " {" << std::endl; os << " {" << std::endl;
if (!structData.returnedOnly) for (size_t i = 0; i < structData.members.size(); i++)
{ {
for (size_t i = 0; i < structData.members.size(); i++) if (!structData.members[i].arraySize.empty())
{ {
if (!structData.members[i].arraySize.empty()) // here we can handle the arrays, copying over from argument (with trailing '_') to member
{ // size is arraySize times sizeof type
// here we can handle the arrays, copying over from argument (with trailing '_') to member std::string member = structData.members[i].name;
// size is arraySize times sizeof type std::string arraySize = structData.members[i].arraySize;
std::string member = structData.members[i].name; std::string type = structData.members[i].type;
std::string arraySize = structData.members[i].arraySize; os << replaceWithMap(" memcpy( &${member}, ${member}_.data(), ${arraySize} * sizeof( ${type} ) );\n",
std::string type = structData.members[i].type; { { "member", member },{ "arraySize", arraySize },{ "type", type } });
os << replaceWithMap(" memcpy( &${member}, ${member}_.data(), ${arraySize} * sizeof( ${type} ) );\n",
{ { "member", member },{ "arraySize", arraySize },{ "type", type } });
}
} }
} }
os << " }\n\n"; os << " }\n\n";
@ -4536,7 +4507,11 @@ void VulkanHppGenerator::writeTypeStruct(std::ostream & os, DependencyData const
os << " struct " << dependencyData.name << std::endl os << " struct " << dependencyData.name << std::endl
<< " {" << std::endl; << " {" << std::endl;
writeStructConstructor(os, dependencyData.name, it->second, defaultValues); // only structs that are not returnedOnly get a constructor!
if (!it->second.returnedOnly)
{
writeStructConstructor(os, dependencyData.name, it->second, defaultValues);
}
// create the setters // create the setters
if (!it->second.returnedOnly) if (!it->second.returnedOnly)
@ -4593,15 +4568,22 @@ void VulkanHppGenerator::writeTypeStruct(std::ostream & os, DependencyData const
if (it->second.members[i].type == "StructureType") if (it->second.members[i].type == "StructureType")
{ {
assert((i == 0) && (it->second.members[i].name == "sType")); assert((i == 0) && (it->second.members[i].name == "sType"));
assert(!it->second.members[i].values.empty());
auto nameIt = m_nameMap.find(it->second.members[i].values);
assert(nameIt != m_nameMap.end());
os << " private:" << std::endl os << " private:" << std::endl
<< " StructureType sType;" << std::endl << " StructureType sType = " << nameIt->second << ";" << std::endl
<< std::endl << std::endl
<< " public:" << std::endl; << " public:" << std::endl;
} }
else else
{ {
os << " " << it->second.members[i].type << " " << it->second.members[i].name; os << " " << it->second.members[i].type << " " << it->second.members[i].name;
if (!it->second.members[i].arraySize.empty()) if (it->second.members[i].name == "pNext")
{
os << " = nullptr";
}
else if (!it->second.members[i].arraySize.empty())
{ {
os << "[" << it->second.members[i].arraySize << "]"; os << "[" << it->second.members[i].arraySize << "]";
} }

2330
vulkan/vulkan.hpp
View File

File diff suppressed because it is too large Load Diff