From de8c1ab62a7a720c8cb58b24923750f19e38b9f4 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 16 Apr 2021 09:25:42 +0200 Subject: [PATCH] radv: fix fast clearing depth-only or stencil-only aspects with HTILE DB isn't coherent with L2 on GFX6-8. This is needed when the clear HTILE mask path is selected. This fixes an issue with avatars in Heroes of The Storm. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3362 Cc: 21.1 mesa-stable Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: (cherry picked from commit e4c0724dc6e735da738262de0d26d3e583b746bb) --- .pick_status.json | 2 +- src/amd/vulkan/radv_meta_clear.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 76921afa0b0..99bdfd7823a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -202,7 +202,7 @@ "description": "radv: fix fast clearing depth-only or stencil-only aspects with HTILE", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c index 87d18b351e2..0966c5b4a95 100644 --- a/src/amd/vulkan/radv_meta_clear.c +++ b/src/amd/vulkan/radv_meta_clear.c @@ -965,7 +965,8 @@ radv_fast_clear_depth(struct radv_cmd_buffer *cmd_buffer, const struct radv_imag enum radv_cmd_flush_bits bits = radv_src_access_flush(cmd_buffer, VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT, iview->image) | - radv_dst_access_flush(cmd_buffer, VK_ACCESS_SHADER_WRITE_BIT, iview->image); + radv_dst_access_flush(cmd_buffer, VK_ACCESS_SHADER_WRITE_BIT | + VK_ACCESS_SHADER_READ_BIT, iview->image); cmd_buffer->state.flush_bits |= bits & ~*pre_flush; *pre_flush |= cmd_buffer->state.flush_bits; }