Vulkan: Clear mCurrentGraphicsPipeline after createPipelineLayout()

Set mCurrentGraphicsPipeline = nullptr when the pipeline layout is recreated if immutable samplers are used to prevent a use-after-free. For a fuller discussion on why this is necessary, see: Vulkan: clear mCurrentGraphicsPipeline during invalidate | https://chromium-review.googlesource.com/c/angle/angle/+/2647746 Bug: b/178424566 Bug: angleproject:5624 Change-Id: I70679bda85cd587dbd8893a4576ee5d33aee2b70 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2683041 Commit-Queue: Tim Van Patten <timvp@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Vulkan: Clear mCurrentGraphicsPipeline after createPipelineLayout()
dccec125 · Tim Van Patten · Commit Bot · 393c44f1 · dccec125
Commit dccec125 authored Feb 08, 2021 by Tim Van Patten Committed by Commit Bot Feb 11, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

ContextVk.cpp src/libANGLE/renderer/vulkan/ContextVk.cpp +4 -0

No files found.
--- a/src/libANGLE/renderer/vulkan/ContextVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ContextVk.cpp
@@ -4221,6 +4221,10 @@ angle::Result ContextVk::updateActiveTextures(const gl::Context *context)
        // will likely affect performance negatively.
        ANGLE_TRY(mExecutable->createPipelineLayout(context, &mActiveTextures));
        invalidateCurrentGraphicsPipeline();
+
+        // TODO(http://anglebug.com/5624): rework updateActiveTextures(), createPipelineLayout(),
+        // and handleDirtyGraphicsPipeline().
+        mCurrentGraphicsPipeline = nullptr;
    }

    return angle::Result::Continue;