From 7f52544f6f6aa8a375b4caea5487ca5d79f69a51 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Sun, 23 May 2021 00:11:18 +0000 Subject: [PATCH] venus: fix vn_GetAndroidHardwareBufferPropertiesANDROID Append a VK_FORMAT_FEATURE_MIDPOINT_CHROMA_SAMPLES_BIT bit to pass cts. Signed-off-by: Yiwei Zhang Reviewed-by: Chia-I Wu Part-of: --- src/virtio/vulkan/vn_android.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/virtio/vulkan/vn_android.c b/src/virtio/vulkan/vn_android.c index 58df3f8f0eb..cf7d99e8793 100644 --- a/src/virtio/vulkan/vn_android.c +++ b/src/virtio/vulkan/vn_android.c @@ -803,12 +803,19 @@ vn_android_get_ahb_format_properties( if (result != VK_SUCCESS) return result; + /* The spec requires that formatFeatures must include at least one of + * VK_FORMAT_FEATURE_MIDPOINT_CHROMA_SAMPLES_BIT or + * VK_FORMAT_FEATURE_COSITED_CHROMA_SAMPLES_BIT. + */ + const VkFormatFeatureFlags format_features = + mod_props.drmFormatModifierTilingFeatures | + VK_FORMAT_FEATURE_MIDPOINT_CHROMA_SAMPLES_BIT; *out_props = (VkAndroidHardwareBufferFormatPropertiesANDROID) { .sType = out_props->sType, .pNext = out_props->pNext, .format = format, .externalFormat = desc.format, - .formatFeatures = mod_props.drmFormatModifierTilingFeatures, + .formatFeatures = format_features, .samplerYcbcrConversionComponents = { .r = VK_COMPONENT_SWIZZLE_IDENTITY, .g = VK_COMPONENT_SWIZZLE_IDENTITY,