From 8be6eab83626c26af961aee5471cf83970f88ec2 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Tue, 16 Jan 2024 13:58:54 +0200 Subject: [PATCH] anv: rename aux_tt image field We'll add more to the sub-struct Signed-off-by: Lionel Landwerlin Reviewed-by: Jianxun Zhang Part-of: (cherry picked from commit eead86ad8e353234f47e00fb25b393dddb15106c) --- .pick_status.json | 2 +- src/intel/vulkan/anv_image.c | 4 ++-- src/intel/vulkan/anv_private.h | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 006872094b0..fe9bb3f7978 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -574,7 +574,7 @@ "description": "anv: rename aux_tt image field", "nominated": false, "nomination_type": 3, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index 67b44587d98..3cc1fe98afe 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -1767,7 +1767,7 @@ anv_image_finish(struct anv_image *image) * mapping. */ for (int p = 0; p < image->n_planes; ++p) { - if (!image->planes[p].aux_ccs_mapped) + if (!image->planes[p].aux_tt.mapped) continue; const struct anv_address main_addr = @@ -2267,7 +2267,7 @@ anv_image_map_aux_tt(struct anv_device *device, anv_address_physical(main_addr), anv_address_physical(aux_addr), surf->size_B, format_bits)) { - image->planes[plane].aux_ccs_mapped = true; + image->planes[plane].aux_tt.mapped = true; return true; } } diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index c90cb3ab0dc..f35c7f25586 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -5016,7 +5016,10 @@ struct anv_image { */ bool can_non_zero_fast_clear; - bool aux_ccs_mapped; + struct { + /** Whether the image has CCS data mapped through AUX-TT. */ + bool mapped; + } aux_tt; } planes[3]; struct anv_image_memory_range vid_dmv_top_surface;