From 7f6e6eb8ecc0ecacff66bd4de954277200ab52de Mon Sep 17 00:00:00 2001 From: Rohan Garg Date: Fri, 28 Jul 2023 12:35:49 +0200 Subject: [PATCH] anv: partially revert 2e8b1f6d set_image_compressed_bit checks for the image aux usage whereas cmd_buffer_mark_image_written checks for the subresource's aux usage. Signed-off-by: Rohan Garg Fixes: 2e8b1f6d ('anv: drop duplicate checks when setting the compressed bit') Reviewed-by: Nanley Chery Part-of: --- src/intel/vulkan/genX_cmd_buffer.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 7c31784..d922c65 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -772,6 +772,15 @@ genX(cmd_buffer_mark_image_written)(struct anv_cmd_buffer *cmd_buffer, { /* The aspect must be exactly one of the image aspects. */ assert(util_bitcount(aspect) == 1 && (aspect & image->vk.aspects)); + + /* Filter out aux usages that don't have any compression tracking. + * Note: We only have compression tracking for CCS_E images, but it's + * possible for a CCS_E enabled image to have a subresource with a different + * aux usage. + */ + if (!isl_aux_usage_has_compression(aux_usage)) + return; + set_image_compressed_bit(cmd_buffer, image, aspect, level, base_layer, layer_count, true); } -- 2.7.4