Fix leak of VkImage handle

track explicitly whether the handle is owned and should be deleted

Bug: chromium:1473001
Change-Id: I239b392571cc6d21ccfb392e6124df08b3283c33
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/147081
Kokoro: Kokoro <[email protected]>
Commit-Queue: Austin Eng <[email protected]>
Reviewed-by: Loko Kung <[email protected]>

Author: austinEng

src/dawn/native/vulkan/TextureVk.cpp

@@ -736,6 +736,7 @@ MaybeError Texture::InitializeAsInternalTexture(VkImageUsageFlags extraUsages) {
     DAWN_TRY(CheckVkSuccess(
         device->fn.CreateImage(device->GetVkDevice(), &createInfo, nullptr, &*mHandle),
         "CreateImage"));
+    mOwnsHandle = true;
 
     // Create the image memory and associate it with the container
     VkMemoryRequirements requirements;
@@ -847,6 +848,7 @@ MaybeError Texture::InitializeFromExternal(const ExternalImageDescriptorVk* desc
     }
 
     DAWN_TRY_ASSIGN(mHandle, externalMemoryService->CreateImage(descriptor, baseCreateInfo));
+    mOwnsHandle = true;
 
     SetLabelHelper("Dawn_ExternalTexture");
 
@@ -998,13 +1000,7 @@ void Texture::SetLabelImpl() {
 void Texture::DestroyImpl() {
     Device* device = ToBackend(GetDevice());
 
-    // The VkImage is only allocated if it is backed by a valid memory allocation.
-    // It is not allocated if the Texture was initialized from an external VkImage,
-    // like a swapchin.
-    bool allocatedVkImage = (mMemoryAllocation.GetInfo().mMethod != AllocationMethod::kInvalid ||
-                             mExternalAllocation != VK_NULL_HANDLE) &&
-                            mHandle != VK_NULL_HANDLE;
-    if (allocatedVkImage) {
+    if (mOwnsHandle) {
         device->GetFencedDeleter()->DeleteWhenUnused(mHandle);
     }
 

src/dawn/native/vulkan/TextureVk.h

@@ -142,6 +142,7 @@ class Texture final : public TextureBase {
     bool CanReuseWithoutBarrier(wgpu::TextureUsage lastUsage, wgpu::TextureUsage usage);
 
     VkImage mHandle = VK_NULL_HANDLE;
+    bool mOwnsHandle = false;
     ResourceMemoryAllocation mMemoryAllocation;
     VkDeviceMemory mExternalAllocation = VK_NULL_HANDLE;