radv: don't support tc-compat on multisample d32s8 at all.

RX550 fails
dEQP-VK.renderpass.suballocation.multisample.d32_sfloat_s8_uint.samples_2

So increase the range of the workaround.

Fixes: f4c534ef6 (radv: don't enable tc compat for d32s8 + 4/8 samples (v1.1))

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index b4de725..5ac0f72 100644 (file)
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -116,8 +116,8 @@ radv_init_surface(struct radv_device *device,
                    pCreateInfo->mipLevels <= 1 &&
                    device->physical_device->rad_info.chip_class >= VI &&
                    ((pCreateInfo->format == VK_FORMAT_D32_SFLOAT ||
-                     /* for some reason TC compat with 4/8 samples breaks some cts tests - disable for now */
-                     (pCreateInfo->samples < 4 && pCreateInfo->format == VK_FORMAT_D32_SFLOAT_S8_UINT)) ||
+                     /* for some reason TC compat with 2/4/8 samples breaks some cts tests - disable for now */
+                     (pCreateInfo->samples < 2 && pCreateInfo->format == VK_FORMAT_D32_SFLOAT_S8_UINT)) ||
                     (device->physical_device->rad_info.chip_class >= GFX9 &&
                      pCreateInfo->format == VK_FORMAT_D16_UNORM)))
                        surface->flags |= RADEON_SURF_TC_COMPATIBLE_HTILE;