commit 09abfc3ba6fb67d140207edb927b9a003ad5fa89
author paul-lunarg <paul@lunarg.com> Mon Aug 29 15:16:20 2022 +0200
committer paul-lunarg <107417418+paul-lunarg@users.noreply.github.com> Tue Aug 30 20:33:56 2022 +0100
tree dbe47ee259a813713f2de7898d7d427ee404a150
parent 17fa97582c5b6306dc89d2ea0a98d7f01c52dae1

tests: Fix SetupValidationSettings

tests/vkrenderframework.cpp

diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 6693e30..7bdabdc 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -443,32 +443,24 @@
 #endif
 }
 
-inline void CheckDisableCoreValidation(VkValidationFeaturesEXT *features) {
+inline void CheckDisableCoreValidation(VkValidationFeaturesEXT &features) {
     auto disable = GetEnvironment("VK_LAYER_TESTS_DISABLE_CORE_VALIDATION");
     std::transform(disable.begin(), disable.end(), disable.begin(), ::tolower);
     if (disable == "false" || disable == "0" || disable == "FALSE") {       // default is to change nothing, unless flag is correctly specified
-        features->disabledValidationFeatureCount = 0;                       // remove all disables to get all validation messages
+        features.disabledValidationFeatureCount = 0;                        // remove all disables to get all validation messages
     }
 }
 
-inline void *SetupValidationSettings(void *first_pnext) {
+void *VkRenderFramework::SetupValidationSettings(void *first_pnext) {
     auto validation = GetEnvironment("VK_LAYER_TESTS_VALIDATION_FEATURES");
     std::transform(validation.begin(), validation.end(), validation.begin(), ::tolower);
-    VkValidationFeaturesEXT *features = nullptr;
-    {
-        void *pnext = first_pnext;
-        while (pnext) {
-            if (reinterpret_cast<const VkBaseOutStructure *>(pnext)->sType == VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT) {
-                features = reinterpret_cast<VkValidationFeaturesEXT *>(pnext);
-                CheckDisableCoreValidation(features);
-                break;
-            }
-            pnext = reinterpret_cast<const VkBaseOutStructure *>(pnext)->pNext;
-        }
+    VkValidationFeaturesEXT *features = LvlFindModInChain<VkValidationFeaturesEXT>(first_pnext);
+    if (features) {
+        CheckDisableCoreValidation(*features);
     }
     if (validation == "all" || validation == "core" || validation == "none") {
         if (!features) {
-            features = new VkValidationFeaturesEXT{};
+            features = &validation_features;
             features->sType = VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT;
             features->pNext = first_pnext;
             first_pnext = features;