Vulkan: Fix memory corruption crash

When VK_EXT_LINE_RASTERIZATION or VK_EXT_PROVOKING_VERTEX is present, createInfo's pNext pointer is set, which caused pEnabledFeatures to not be set, which ended up causing memory corruption issues. This change was made to comply with the Vulkan spec, specifically: "If the pNext chain includes a VkPhysicalDeviceFeatures2 structure, then pEnabledFeatures must be NULL" Since the VkPhysicalDeviceFeatures2 structure is only added to the pNext member of the createInfo structure in the if statement above, restoring the else statement solves this issue. Bug: angleproject:4060 Change-Id: I0688c4297f167fa28e110cd6ee11a11b95282493 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1899731Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Tobin Ehlis <tobine@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Vulkan: Fix memory corruption crash
1d09b983 · Alexis Hetu · Commit Bot · 1bae5615 · 1d09b983
Commit 1d09b983 authored Nov 05, 2019 by Alexis Hetu Committed by Commit Bot Nov 05, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

RendererVk.cpp src/libANGLE/renderer/vulkan/RendererVk.cpp +1 -2

No files found.
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -1106,8 +1106,7 @@ angle::Result RendererVk::initializeDevice(DisplayVk *displayVk, uint32_t queueF
        AppendToPNextChain(reinterpret_cast<vk::CommonStructHeader *>(&createInfo),
                           &enabledFeatures);
    }
-
-    if (createInfo.pNext == nullptr)
+    else
    {
        // Enable all available features
        createInfo.pEnabledFeatures = &enabledFeatures.features;