From b64cd520f7858814374e19b8a2ca2f36e6871367 Mon Sep 17 00:00:00 2001
From: Allen Ballway <ballway@chromium.org>
Date: Thu, 23 Apr 2026 22:59:48 +0000
Subject: [PATCH] vulkan/android: Set COLOR_ATTACHMENT_BIT for external format
 resolve

When using ANDROID_external_format_resolve if a valid
colorAttachmentFormat is returned by
VkAndroidHardwareBufferFormatResolvePropertiesAndroid, the
formatFeatures should include VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT so
strict applications can use the buffer as a render target.

Signed-off-by: Allen Ballway <ballway@chromium.org>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Lucas Fryzek <lfryzek@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41142>
---
 src/vulkan/runtime/vk_android.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vulkan/runtime/vk_android.c b/src/vulkan/runtime/vk_android.c
index ad5c032f6bd..035302b52d1 100644
--- a/src/vulkan/runtime/vk_android.c
+++ b/src/vulkan/runtime/vk_android.c
@@ -1066,6 +1066,11 @@ vk_common_GetAndroidHardwareBufferPropertiesANDROID(
          format_resolve->colorAttachmentFormat =
             num_bits == 8 ? VK_FORMAT_R8G8B8A8_UNORM
                           : VK_FORMAT_R16G16B16A16_UNORM;
+
+         format_prop2->formatFeatures |= VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT;
+         if (format_prop) {
+            format_prop->formatFeatures |= VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT;
+         }
       } else {
          format_resolve->colorAttachmentFormat = VK_FORMAT_UNDEFINED;
       }