Vulkan: Fix variable scope bug during vkCreateInstance

While enabling best practices layer the struct that gets added to the pNext chain is a stack variable and goes out of scope beyond the if-check. Move the struct variables out of local scope to prevent access violation errors during vkCreateInstance. Bug: b/156661359 Change-Id: Ifa470ff1e51d454782695adcf40b4db2aa1608a0 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2335747Reviewed-by: Cody Northrop <cnorthrop@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Mohan Maiya <m.maiya@samsung.com>

Vulkan: Fix variable scope bug during vkCreateInstance
709472c9 · Mohan Maiya · Commit Bot · 11207393 · 709472c9
Commit 709472c9 authored Aug 03, 2020 by Mohan Maiya Committed by Commit Bot Aug 04, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 6 deletions

RendererVk.cpp src/libANGLE/renderer/vulkan/RendererVk.cpp +7 -6

No files found.
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -721,15 +721,16 @@ angle::Result RendererVk::initialize(DisplayVk *displayVk,
    instanceInfo.enabledLayerCount   = static_cast<uint32_t>(enabledInstanceLayerNames.size());
    instanceInfo.ppEnabledLayerNames = enabledInstanceLayerNames.data();
+    VkValidationFeatureEnableEXT enabledFeatures[] = {
+        VK_VALIDATION_FEATURE_ENABLE_BEST_PRACTICES_EXT};
+    VkValidationFeaturesEXT validationFeatures       = {};
+    validationFeatures.sType                         = VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT;
+    validationFeatures.enabledValidationFeatureCount = 1;
+    validationFeatures.pEnabledValidationFeatures    = enabledFeatures;
    if (mEnableValidationLayers)
    {
        // Enable best practices output which includes perfdoc layer
-        VkValidationFeatureEnableEXT enabledFeatures[] = {
-            VK_VALIDATION_FEATURE_ENABLE_BEST_PRACTICES_EXT};
-        VkValidationFeaturesEXT validationFeatures = {};
-        validationFeatures.sType                   = VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT;
-        validationFeatures.enabledValidationFeatureCount = 1;
-        validationFeatures.pEnabledValidationFeatures    = enabledFeatures;
        vk::AddToPNextChain(&instanceInfo, &validationFeatures);
    }