Mesa (master): radv/gfx9: use correct stencil format for tc compat htile.

[Dave Airlie]

Module: Mesa
Branch: master
Commit: 5ba26ed6e5aca41d285613ce8d29fed032db87a9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ba26ed6e5aca41d285613ce8d29fed032db87a9

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Dec 27 11:22:58 2017 +1000

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 at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/amd/vulkan/radv_image.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index b1c4f3340e..40e6dfc3af 100644
--- 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) {