mirror/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2024-09-20 05:52:16 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Slightly improved vector-size determination on functions returning a vector and detection if a singular version of a function should be generated. (#229)

Browse Source
This commit is contained in:
Andreas Süßenbach 2018-07-11 08:50:20 +02:00 committed by Markus Tavenrath
parent fbd17bb272
commit 76bf85b50e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
VulkanHppGenerator.cpp
View File

@ -3434,16 +3434,21 @@ std::string VulkanHppGenerator::writeFunctionBodyEnhancedLocalReturnVariable(std
else else
{ {
// the size of the vector is given by an other parameter // the size of the vector is given by an other parameter
// that means (as this is not a two-step algorithm) it's size is determined by some other vector parameter! // first check, if that size has become the size of some other vector parameter
// -> look for it and get it's actual size // -> look for it and get it's actual size
for (auto const& vectorParam : commandData.vectorParams) for (auto const& vectorParam : commandData.vectorParams)
{ {
if ((vectorParam.first != commandData.returnParam) && (vectorParam.second == it->second)) if ((vectorParam.first != it->first) && (vectorParam.second == it->second))
{ {
size = startLowerCase(strip(commandData.params[vectorParam.first].name, "p")) + ".size()"; size = startLowerCase(strip(commandData.params[vectorParam.first].name, "p")) + ".size()";
break; break;
} }
} }
if (size.empty())
{
// otherwise, just use that parameter
size = commandData.params[it->second].name;
}
} }
assert(!size.empty()); assert(!size.empty());
os << "( " << size << " )"; os << "( " << size << " )";
@ -4388,7 +4393,10 @@ void VulkanHppGenerator::writeTypeCommand(std::ostream & os, std::string const&
// then a singular version, if a sized vector would be returned // then a singular version, if a sized vector would be returned
std::map<size_t, size_t>::const_iterator returnVector = commandData.vectorParams.find(commandData.returnParam); std::map<size_t, size_t>::const_iterator returnVector = commandData.vectorParams.find(commandData.returnParam);
bool singular = (returnVector != commandData.vectorParams.end()) && (returnVector->second != ~0) && (commandData.params[returnVector->second].type.back() != '*'); bool singular = (returnVector != commandData.vectorParams.end()) &&
(returnVector->second != ~0) &&
(commandData.params[returnVector->first].pureType != "void") &&
(commandData.params[returnVector->second].type.back() != '*');
if (singular) if (singular)
{ {
writeFunction(enhanced, indentation, commandData, definition, true, true, false, false); writeFunction(enhanced, indentation, commandData, definition, true, true, false, false);