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 <rohan.garg@intel.com>
Fixes: 2e8b1f6d ('anv: drop duplicate checks when setting the compressed bit')
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24363>
(cherry picked from commit 7f6e6eb8ec)
This commit is contained in:
Rohan Garg 2023-07-28 12:35:49 +02:00 committed by Dylan Baker
parent de27a950cc
commit 4ec17ca7df
2 changed files with 10 additions and 1 deletions

View file

@ -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

View file

@ -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);
}