Mesa (main): venus: enable wsi image ownership transfer for common wsi

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 889a8df5bda5681bb0e14c82df7aed54b59f243d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=889a8df5bda5681bb0e14c82df7aed54b59f243d

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Fri May 14 12:03:31 2021 -0700

venus: enable wsi image ownership transfer for common wsi

v2: this is split out from the last commit

Signed-off-by: Chia-I Wu <olvaffe at gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei at chromium.org> (v1)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10709>

---

 src/virtio/vulkan/vn_image.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/virtio/vulkan/vn_image.h b/src/virtio/vulkan/vn_image.h
index 74ee7f6e2ab..98469c60adf 100644
--- a/src/virtio/vulkan/vn_image.h
+++ b/src/virtio/vulkan/vn_image.h
@@ -13,12 +13,10 @@
 
 #include "vn_common.h"
 
-/* XXX drop the #ifdef after fixing common wsi */
-#ifdef ANDROID
+/* changing this to VK_IMAGE_LAYOUT_PRESENT_SRC_KHR disables ownership
+ * transfers and can be useful for debugging
+ */
 #define VN_PRESENT_SRC_INTERNAL_LAYOUT VK_IMAGE_LAYOUT_GENERAL
-#else
-#define VN_PRESENT_SRC_INTERNAL_LAYOUT VK_IMAGE_LAYOUT_PRESENT_SRC_KHR
-#endif
 
 struct vn_image_create_deferred_info {
    VkImageCreateInfo create;