From bceab2b9d226b8963af71941e6b7ac364e8b478c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= Date: Thu, 23 Feb 2023 10:07:26 +0100 Subject: [PATCH] Change assertion to condition on generating the vector size check. (#1518) --- VulkanHppGenerator.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index 74ae510..4484361 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -8098,10 +8098,8 @@ std::string VulkanHppGenerator::generateRAIIHandleVectorSizeCheck( std::string c size_t defaultStartIndex = determineDefaultStartIndex( commandData.params, skippedParams ); std::string firstVectorName = startLowerCase( stripPrefix( commandData.params[cvm.second[0]].name, "p" ) ); - if ( cvm.second.size() == 1 ) + if ( ( cvm.second.size() == 1 ) && ( isLenByStructMember( commandData.params[cvm.second[0]].len, commandData.params[cvm.first] ) ) ) { - assert( isLenByStructMember( commandData.params[cvm.second[0]].len, commandData.params[cvm.first] ) ); - std::vector lenParts = tokenize( commandData.params[cvm.second[0]].len, "->" ); assert( lenParts.size() == 2 ); std::string sizeValue = startLowerCase( stripPrefix( lenParts[0], "p" ) ) + "." + lenParts[1]; @@ -9972,10 +9970,8 @@ std::string VulkanHppGenerator::generateVectorSizeCheck( std::string const & size_t defaultStartIndex = determineDefaultStartIndex( commandData.params, skippedParams ); std::string firstVectorName = startLowerCase( stripPrefix( commandData.params[cvm.second[0]].name, "p" ) ); - if ( cvm.second.size() == 1 ) + if ( ( cvm.second.size() == 1 ) && ( isLenByStructMember( commandData.params[cvm.second[0]].len, commandData.params[cvm.first] ) ) ) { - assert( isLenByStructMember( commandData.params[cvm.second[0]].len, commandData.params[cvm.first] ) ); - std::vector lenParts = tokenize( commandData.params[cvm.second[0]].len, "->" ); assert( lenParts.size() == 2 ); std::string sizeValue = startLowerCase( stripPrefix( lenParts[0], "p" ) ) + "." + lenParts[1];