From 4ec17ca7df29049c227c98f2f6e1ad351cf01eaa 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: (cherry picked from commit 7f6e6eb8ecc0ecacff66bd4de954277200ab52de) --- .pick_status.json | 2 +- src/intel/vulkan/genX_cmd_buffer.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 3327a576aa2..45eb2b9cc33 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -22214,7 +22214,7 @@ "description": "anv: partially revert 2e8b1f6d", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "2e8b1f6d1c82077c2744ef2009318ab056da6f49", "notes": null diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index df4ee52f7b3..c6859f90ad5 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); }