From 9eb1b578eefb312fcea18a5814a46fcaa0e56388 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Thu, 2 Jul 2020 10:56:05 +0200 Subject: [PATCH] v3dv: use swizzle X001 with D/S formats This matches Vulkan CTS expectations. Fixes (for D/S formats): dEQP-VK.pipeline.sampler.view_type.* Part-of: --- src/broadcom/vulkan/v3dv_formats.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/broadcom/vulkan/v3dv_formats.c b/src/broadcom/vulkan/v3dv_formats.c index bc2debc329b..bd5fdb77383 100644 --- a/src/broadcom/vulkan/v3dv_formats.c +++ b/src/broadcom/vulkan/v3dv_formats.c @@ -138,12 +138,12 @@ static const struct v3dv_format format_table[] = { FORMAT(B10G11R11_UFLOAT_PACK32, R11F_G11F_B10F,R11F_G11F_B10F, SWIZ_XYZW, 16, true), /* Depth */ - FORMAT(D16_UNORM, D16, DEPTH_COMP16, SWIZ_XXXX, 32, false), - FORMAT(D32_SFLOAT, D32F, DEPTH_COMP32F, SWIZ_XXXX, 32, false), - FORMAT(X8_D24_UNORM_PACK32, D24S8, DEPTH24_X8, SWIZ_XXXX, 32, false), + FORMAT(D16_UNORM, D16, DEPTH_COMP16, SWIZ_X001, 32, false), + FORMAT(D32_SFLOAT, D32F, DEPTH_COMP32F, SWIZ_X001, 32, false), + FORMAT(X8_D24_UNORM_PACK32, D24S8, DEPTH24_X8, SWIZ_X001, 32, false), /* Depth + Stencil */ - FORMAT(D24_UNORM_S8_UINT, D24S8, DEPTH24_X8, SWIZ_XXXX, 32, false), + FORMAT(D24_UNORM_S8_UINT, D24S8, DEPTH24_X8, SWIZ_X001, 32, false), /* Compressed: ETC2 / EAC */ FORMAT(ETC2_R8G8B8_UNORM_BLOCK, NO, RGB8_ETC2, SWIZ_XYZ1, 16, true),