From 5eb4b384d93d8733004349756ada0060616789ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Wed, 25 Jul 2018 14:26:33 +0300 Subject: [PATCH 1/1] anv: add more swapchain formats MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This change helps with some of the dEQP-VK.wsi.android.* tests that try to create swapchain with using such formats. Signed-off-by: Tapani Pälli Reviewed-by: Chad Versace --- src/intel/vulkan/anv_android.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/intel/vulkan/anv_android.c b/src/intel/vulkan/anv_android.c index a3bab8087b4..46c41d57861 100644 --- a/src/intel/vulkan/anv_android.c +++ b/src/intel/vulkan/anv_android.c @@ -300,11 +300,17 @@ VkResult anv_GetSwapchainGrallocUsageANDROID( * * FINISHME: Advertise all display-supported formats. */ - if (format == VK_FORMAT_B8G8R8A8_UNORM || - format == VK_FORMAT_B5G6R5_UNORM_PACK16) { - *grallocUsage |= GRALLOC_USAGE_HW_FB | - GRALLOC_USAGE_HW_COMPOSER | - GRALLOC_USAGE_EXTERNAL_DISP; + switch (format) { + case VK_FORMAT_B8G8R8A8_UNORM: + case VK_FORMAT_B5G6R5_UNORM_PACK16: + case VK_FORMAT_R8G8B8A8_UNORM: + case VK_FORMAT_R8G8B8A8_SRGB: + *grallocUsage |= GRALLOC_USAGE_HW_FB | + GRALLOC_USAGE_HW_COMPOSER | + GRALLOC_USAGE_EXTERNAL_DISP; + break; + default: + intel_logw("%s: unsupported format=%d", __func__, format); } if (*grallocUsage == 0) -- 2.30.2