radv/gfx9: use correct stencil format for tc compat htile.

This needs to correspond to the bit depth of the Z plane.

noticed in passing reading amdvlk.

Fixes: fc6c77e162df3 (radv: fix TC-compat HTILE with VK_FORMAT_D32_SFLOAT_S8_UINT on Vega)
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
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 b1c4f3340eddd75011e1db77cd34fc0ec46278a2..40e6dfc3af151f8a57ace177bfbe31a8d3fd704c 100644 (file)
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -416,12 +416,15 @@ si_make_texture_descriptor(struct radv_device *device,
                data_format = 0;
        }
 
-       /* S8 with Z32 HTILE needs a special format. */
+       /* S8 with either Z16 or Z32 HTILE need a special format. */
        if (device->physical_device->rad_info.chip_class >= GFX9 &&
            vk_format == VK_FORMAT_S8_UINT &&
-           image->tc_compatible_htile)
-               data_format = V_008F14_IMG_DATA_FORMAT_S8_32;
-
+           image->tc_compatible_htile) {
+               if (image->vk_format == VK_FORMAT_D32_SFLOAT_S8_UINT)
+                       data_format = V_008F14_IMG_DATA_FORMAT_S8_32;
+               else if (image->vk_format == VK_FORMAT_D16_UNORM_S8_UINT)
+                       data_format = V_008F14_IMG_DATA_FORMAT_S8_16;
+       }
        type = radv_tex_dim(image->type, view_type, image->info.array_size, image->info.samples,
                            is_storage_image, device->physical_device->rad_info.chip_class >= GFX9);
        if (type == V_008F1C_SQ_RSRC_IMG_1D_ARRAY) {