Mesa (master): radv: initialize TC-compat CMASK images with the DCC clear code

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Thu Mar  4 19:37:41 2021 +0100

radv: initialize TC-compat CMASK images with the DCC clear code

0xff is for fast-clears without MSAA.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9415>

---

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

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 5f811cb3e20..85253a76eca 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -6289,9 +6289,10 @@ static void radv_init_color_image_metadata(struct radv_cmd_buffer *cmd_buffer,
 		 * CMASK is used (such as when transitioning to a compressed
 		 * layout).
 		 */
-		if (radv_image_has_fmask(image) &&
-		    radv_layout_can_fast_clear(cmd_buffer->device, image, dst_layout,
-					       dst_render_loop, dst_queue_mask)) {
+		if (radv_image_is_tc_compat_cmask(image) ||
+		    (radv_image_has_fmask(image) &&
+		     radv_layout_can_fast_clear(cmd_buffer->device, image, dst_layout,
+					       dst_render_loop, dst_queue_mask))) {
 			value = 0xccccccccu;
 		}