Module: Mesa Branch: main Commit: 7efabfbbe4f5ae442e62803a7e173bd2bf20001a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7efabfbbe4f5ae442e62803a7e173bd2bf20001a
Author: Hans-Kristian Arntzen <[email protected]> Date: Sun Feb 12 16:02:26 2023 +0100 radv: Fix missing VK_ACCESS_2_SHADER_SAMPLED_READ_BIT. Cannot be used for SSBO, so ignore SCACHE invalidation. Signed-off-by: Hans-Kristian Arntzen <[email protected]> Fixes: 8df17163c78 ("radv: implement vkCmdWaitEvents2KHR") Reviewed-by: Timur Kristóf <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21271> --- src/amd/vulkan/radv_cmd_buffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 5a02befa8e5..dd2b9c374c9 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -5426,12 +5426,13 @@ radv_dst_access_flush(struct radv_cmd_buffer *cmd_buffer, VkAccessFlags2 dst_fla case VK_ACCESS_2_SHADER_BINDING_TABLE_READ_BIT_KHR: case VK_ACCESS_2_SHADER_READ_BIT: case VK_ACCESS_2_SHADER_STORAGE_READ_BIT: - flush_bits |= RADV_CMD_FLAG_INV_VCACHE; /* Unlike LLVM, ACO uses SMEM for SSBOs and we have to * invalidate the scalar cache. */ if (!cmd_buffer->device->physical_device->use_llvm && !image) flush_bits |= RADV_CMD_FLAG_INV_SCACHE; - + FALLTHROUGH; + case VK_ACCESS_2_SHADER_SAMPLED_READ_BIT: + flush_bits |= RADV_CMD_FLAG_INV_VCACHE; if (has_CB_meta || has_DB_meta) flush_bits |= RADV_CMD_FLAG_INV_L2_METADATA; if (!image_is_coherent)
