From c78d2729586508460efd01b638ca5f05377870f2 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Fri, 6 Feb 2026 19:03:41 -0800 Subject: [PATCH] venus: remove obsolete asserts for ANB image creation Those have long been supported by vn_image_deferred_info_init because of AHB support. For non-aliased ANB image, those are directly passed from the platform swapchain create info as well. So we just need to drop the obsolete asserts to make newer Android platform and ANGLE happy. Cc: mesa-stable (cherry picked from commit 091c4f43ff921cfb5a422ace6755f85738287012) Part-of: --- .pick_status.json | 2 +- src/virtio/vulkan/vn_android.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index a44215b9643..e646517ca83 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1324,7 +1324,7 @@ "description": "venus: remove obsolete asserts for ANB image creation", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/virtio/vulkan/vn_android.c b/src/virtio/vulkan/vn_android.c index 2caa597f262..1b42ffcdc99 100644 --- a/src/virtio/vulkan/vn_android.c +++ b/src/virtio/vulkan/vn_android.c @@ -258,12 +258,6 @@ vn_android_image_from_anb_internal(struct vn_device *dev, struct vn_image *img = NULL; VkResult result; - assert(!(create_info->flags & VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT)); - assert(!vk_find_struct_const(create_info->pNext, - IMAGE_FORMAT_LIST_CREATE_INFO)); - assert(!vk_find_struct_const(create_info->pNext, - IMAGE_STENCIL_USAGE_CREATE_INFO)); - struct vn_android_image_builder builder; result = vn_android_get_image_builder(dev, create_info, anb_info->handle, &builder);