commit de37ad1754e2c7b587231a4861a782a5b4be8d92
author Charlie Lao <cclao@google.com> Wed Feb 16 23:30:46 2022
committer Angle LUCI CQ <angle-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Feb 18 23:49:36 2022
tree 64b9da23e6f79bef6834ada7d9300bd708979927
parent 9296f3898ee49cc3a8e9eec890b111022cdc37bb

Vulkan: Call releaseStagedUpdates before releaseImage

When Texture is destroyed, we call
TextureVk::releaseAndDeleteImageAndViews(). Right now it calls
releaseImage() first and then calls releaseStagedUpdates(). The correct
order should be releaseStagedUpdates() before releaseImages(). Otherwise
for EGLImages, releaseImages will set mImage to nullptr which will make
releaseStagedUpdates skip and leave the staged updates there which
causes problem since context gets destroyed while EGLImage still hold
onto staging buffer belongs to this context's shared group.

Bug: b/219646764
Change-Id: I04a005b742a0d90b981a2f399a5e03b03e3a0adb
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3469727
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Ian Elliott <ianelliott@google.com>
Commit-Queue: Charlie Lao <cclao@google.com>

src/libANGLE/renderer/vulkan/TextureVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/TextureVk.cpp b/src/libANGLE/renderer/vulkan/TextureVk.cpp
index 2390a94..18680e7 100644
--- a/src/libANGLE/renderer/vulkan/TextureVk.cpp
+++ b/src/libANGLE/renderer/vulkan/TextureVk.cpp
@@ -1482,8 +1482,8 @@
 {
     if (mImage)
     {
-        releaseImage(contextVk);
         releaseStagedUpdates(contextVk);
+        releaseImage(contextVk);
         mImageObserverBinding.bind(nullptr);
         mRequiresMutableStorage = false;
         mRequiredImageAccess    = vk::ImageAccess::SampleOnly;