commit 4e6f4df9cbfcfd41143e80572b499df662cbfcbb
author Yahan Zhou <yahan@google.com> Tue Oct 17 10:45:03 2023 -0700
committer Yahan Zhou <yahan@google.com> Tue Oct 17 10:45:03 2023 -0700
tree 8ab58ce4e6bb2701073d7e7364d2dd3ce6d159ef
parent afa9c8b440e52150a321ffc777b6b753a65dbaf3

Fix dEQP-VK.wsi.android.maintenance1

 - There is a bug in the wait implementation.
 - We should not send VK_IMAGE_LAYOUT_MAX_ENUM to host.

Bug: 300276632
Test: dEQP-VK.wsi.android.maintenance1.*
Change-Id: Ib014a90437eca8f8a653e31076b6c383bf2394b7

guest/vulkan_enc/ResourceTracker.cpp

diff --git a/guest/vulkan_enc/ResourceTracker.cpp b/guest/vulkan_enc/ResourceTracker.cpp
index 1bc726b..4e8c877 100644
--- a/guest/vulkan_enc/ResourceTracker.cpp
+++ b/guest/vulkan_enc/ResourceTracker.cpp
@@ -1769,7 +1769,7 @@
         .usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT |
                  VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT |
                  VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT,
-        .initialLayout = VK_IMAGE_LAYOUT_MAX_ENUM,
+        .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED,
     };
     VkImage image = VK_NULL_HANDLE;
     VkResult res = enc->vkCreateImage(device, &createInfo, nullptr, &image, true /* do lock */);