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

Make structure information "obsolete" a vector of bool.

Browse Source 
+ remove an obsolete assertion
This commit is contained in:
asuessenbach 2020-12-10 11:11:13 +01:00
parent 8e8fd27337
commit 4bc8906990
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
VulkanHppGenerator.cpp
View File

@ -5682,7 +5682,6 @@ void VulkanHppGenerator::appendStructConstructorsEnhanced( std::string &
if ( litit != lenIts.end() ) if ( litit != lenIts.end() )
{ {
// len arguments just have an initalizer, from the ArrayProxyNoTemporaries size // len arguments just have an initalizer, from the ArrayProxyNoTemporaries size
assert( ( litit->second.size() == 1 ) || !litit->second.front()->optional );
initializers += initializers +=
( firstArgument ? ": " : ", " ) + mit->name + "( " + generateLenInitializer( mit, litit ) + " )"; ( firstArgument ? ": " : ", " ) + mit->name + "( " + generateLenInitializer( mit, litit ) + " )";
sizeChecks += generateSizeCheck( litit->second, stripPrefix( structData.first, "Vk" ), prefix ); sizeChecks += generateSizeCheck( litit->second, stripPrefix( structData.first, "Vk" ), prefix );
@ -7162,16 +7161,16 @@ std::string
std::string secondName = startLowerCase( stripPrefix( arrayIts[second]->name, "p" ) ) + "_"; std::string secondName = startLowerCase( stripPrefix( arrayIts[second]->name, "p" ) ) + "_";
std::string assertionCheck = firstName + ".size() == " + secondName + ".size()"; std::string assertionCheck = firstName + ".size() == " + secondName + ".size()";
std::string throwCheck = firstName + ".size() != " + secondName + ".size()"; std::string throwCheck = firstName + ".size() != " + secondName + ".size()";
if ( arrayIts[first]->optional || arrayIts[second]->optional ) if ( ( !arrayIts[first]->optional.empty() && arrayIts[first]->optional.front() ) || ( !arrayIts[second]->optional.empty() && arrayIts[second]->optional.front() ) )
{ {
assertionCheck = "( " + assertionCheck + " )"; assertionCheck = "( " + assertionCheck + " )";
throwCheck = "( " + throwCheck + " )"; throwCheck = "( " + throwCheck + " )";
if ( arrayIts[second]->optional ) if ( !arrayIts[second]->optional.empty() && arrayIts[second]->optional.front() )
{ {
assertionCheck = secondName + ".empty() || " + assertionCheck; assertionCheck = secondName + ".empty() || " + assertionCheck;
throwCheck = "!" + secondName + ".empty() && " + throwCheck; throwCheck = "!" + secondName + ".empty() && " + throwCheck;
} }
if ( arrayIts[first]->optional ) if ( !arrayIts[first]->optional.empty() && arrayIts[first]->optional.front() )
{ {
assertionCheck = firstName + ".empty() || " + assertionCheck; assertionCheck = firstName + ".empty() || " + assertionCheck;
throwCheck = "!" + firstName + ".empty() && " + throwCheck; throwCheck = "!" + firstName + ".empty() && " + throwCheck;
@ -9288,7 +9287,12 @@ void VulkanHppGenerator::readStructMember( tinyxml2::XMLElement const * element,
} }
else if ( attribute.first == "optional" ) else if ( attribute.first == "optional" )
{ {
memberData.optional = ( attribute.second == "true" ); std::vector<std::string> optional = tokenize( attribute.second, "," );
memberData.optional.reserve( optional.size() );
for ( auto const & o : optional )
{
memberData.optional.push_back( o == "true" );
}
} }
else if ( attribute.first == "selection" ) else if ( attribute.first == "selection" )
{ {

2
VulkanHppGenerator.hpp
View File

@ -222,7 +222,7 @@ private:
std::string bitCount; std::string bitCount;
std::vector<std::string> len; std::vector<std::string> len;
bool noAutoValidity = false; bool noAutoValidity = false;
bool optional = false; std::vector<bool> optional;
std::string selection; std::string selection;
std::string selector; std::string selector;
std::vector<std::string> values; std::vector<std::string> values;

6
vulkan/vulkan.hpp
View File

@ -17850,13 +17850,13 @@ namespace VULKAN_HPP_NAMESPACE
, scratchData( scratchData_ ) , scratchData( scratchData_ )
{ {
# ifdef VULKAN_HPP_NO_EXCEPTIONS # ifdef VULKAN_HPP_NO_EXCEPTIONS
VULKAN_HPP_ASSERT( geometries_.size() == pGeometries_.size() ); VULKAN_HPP_ASSERT( geometries_.empty() || pGeometries_.empty() || ( geometries_.size() == pGeometries_.size() ) );
# else # else
if ( geometries_.size() != pGeometries_.size() ) if ( !geometries_.empty() && !pGeometries_.empty() && ( geometries_.size() != pGeometries_.size() ) )
{ {
throw LogicError( throw LogicError(
VULKAN_HPP_NAMESPACE_STRING VULKAN_HPP_NAMESPACE_STRING
"::AccelerationStructureBuildGeometryInfoKHR::AccelerationStructureBuildGeometryInfoKHR: geometries_.size() != pGeometries_.size()" ); "::AccelerationStructureBuildGeometryInfoKHR::AccelerationStructureBuildGeometryInfoKHR: !geometries_.empty() && !pGeometries_.empty() && ( geometries_.size() != pGeometries_.size() )" );
} }
# endif /*VULKAN_HPP_NO_EXCEPTIONS*/ # endif /*VULKAN_HPP_NO_EXCEPTIONS*/
} }