validation layer: Move repeated code out of generated code.

Noticed because clang-tidy wanted to modernize the for loop.

Author: rpavlik

src/api_layers/core_validation.cpp

@@ -426,6 +426,24 @@ void InvalidStructureType(GenValidUsageXrInstanceInfo *instance_info, const std:
     }
 }
 
+std::string StructTypesToString(GenValidUsageXrInstanceInfo *instance_info, const std::vector<XrStructureType> &structs) {
+    char struct_type_buffer[XR_MAX_STRUCTURE_NAME_SIZE];
+    std::string error_message;
+    if (nullptr == instance_info) {
+        error_message = "UNKNOWN - no instance info available";
+        return error_message;
+    }
+    bool wrote_struct = false;
+    for (auto &s : structs)
+        if (XR_SUCCESS == instance_info->dispatch_table->StructureTypeToString(instance_info->instance, s, struct_type_buffer)) {
+            if (wrote_struct) {
+                error_message += ", ";
+            }
+            wrote_struct = true;
+            error_message += struct_type_buffer;
+        }
+    return error_message;
+}
 // NOTE: Can't validate the following VUIDs since the command never enters a layer:
 // Command: xrEnumerateApiLayerProperties
 //      VUIDs:  "VUID-xrEnumerateApiLayerProperties-propertyCountOutput-parameter"

src/api_layers/validation_utils.h

@@ -208,6 +208,8 @@ void InvalidStructureType(GenValidUsageXrInstanceInfo *instance_info, const std:
                           const char *vuid = nullptr, XrStructureType expected = XrStructureType(0),
                           const char *expected_name = "");
 
+std::string StructTypesToString(GenValidUsageXrInstanceInfo *instance_info, const std::vector<XrStructureType> &structs);
+
 // -- Only implementations of templates follow --//
 
 template <typename HT, typename IT>

src/scripts/validation_layer_generator.py

@@ -1007,35 +1007,7 @@ def writeValidateStructNextCheck(self, struct_type, struct_name, member, indent)
         validate_struct_next += self.writeIndent(indent + 1)
         validate_struct_next += 'error_message += "%s : ";\n' % struct_type
         validate_struct_next += self.writeIndent(indent + 1)
-        validate_struct_next += 'if (nullptr != instance_info) {\n'
-        validate_struct_next += self.writeIndent(indent + 2)
-        validate_struct_next += 'bool wrote_struct = false;\n'
-        validate_struct_next += self.writeIndent(indent + 2)
-        validate_struct_next += 'for (uint32_t dup = 0; dup < duplicate_ext_structs.size(); ++dup) {\n'
-        validate_struct_next += self.writeIndent(indent + 3)
-        validate_struct_next += 'if (XR_SUCCESS == instance_info->dispatch_table->StructureTypeToString(instance_info->instance,\n'
-        validate_struct_next += self.writeIndent(indent + 3)
-        validate_struct_next += '                                                                       duplicate_ext_structs[dup],\n'
-        validate_struct_next += self.writeIndent(indent + 3)
-        validate_struct_next += '                                                                       struct_type_buffer)) {\n'
-        validate_struct_next += self.writeIndent(indent + 4)
-        validate_struct_next += 'if (wrote_struct) {\n'
-        validate_struct_next += self.writeIndent(indent + 5)
-        validate_struct_next += 'error_message += ", ";\n'
-        validate_struct_next += self.writeIndent(indent + 4)
-        validate_struct_next += '} else {\n'
-        validate_struct_next += self.writeIndent(indent + 5)
-        validate_struct_next += 'wrote_struct = true;\n'
-        validate_struct_next += self.writeIndent(indent + 4)
-        validate_struct_next += '}\n'
-        validate_struct_next += self.writeIndent(indent + 4)
-        validate_struct_next += 'error_message += struct_type_buffer;\n'
-        validate_struct_next += self.writeIndent(indent + 3)
-        validate_struct_next += '}\n'
-        validate_struct_next += self.writeIndent(indent + 2)
-        validate_struct_next += '}\n'
-        validate_struct_next += self.writeIndent(indent + 1)
-        validate_struct_next += '}\n'
+        validate_struct_next += 'error_message += StructTypesToString(instance_info, duplicate_ext_structs);\n'
         validate_struct_next += self.writeIndent(indent + 1)
         validate_struct_next += 'CoreValidLogMessage(instance_info, "VUID-%s-next-unique",\n' % struct_type
         validate_struct_next += self.writeIndent(indent + 1)