Mesa (main): intel/aux_map: Nuke format_enum

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 872b4247ad8d51153828ca168ba0d58b11618481
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=872b4247ad8d51153828ca168ba0d58b11618481

Author: José Roberto de Souza <jose.so...@intel.com>
Date:   Mon Jul 10 13:29:16 2023 -0700

intel/aux_map: Nuke format_enum

The only user of format_enum is intel_aux_map_get_alignment() that
can easily use information in format->main_page_size.
This allow us to nuke format_enum and remove duplicated information
in intel_aux_map_get_alignment().

Signed-off-by: José Roberto de Souza <jose.so...@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24077>

---

 src/intel/common/intel_aux_map.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/intel/common/intel_aux_map.c b/src/intel/common/intel_aux_map.c
index fa98170db62..d0c9807a2d7 100644
--- a/src/intel/common/intel_aux_map.c
+++ b/src/intel/common/intel_aux_map.c
@@ -185,7 +185,6 @@ struct intel_aux_map_context {
    uint64_t *level3_map;
    uint32_t tail_offset, tail_remaining;
    uint32_t state_num;
-   enum intel_aux_map_format format_enum;
    const struct aux_format_info *format;
 };
 
@@ -345,7 +344,6 @@ intel_aux_map_init(void *driver_ctx,
    if (pthread_mutex_init(&ctx->mutex, NULL))
       return NULL;
 
-   ctx->format_enum = format;
    ctx->format = get_format(format);
    ctx->driver_ctx = driver_ctx;
    ctx->buffer_alloc = buffer_alloc;
@@ -388,11 +386,7 @@ intel_aux_map_finish(struct intel_aux_map_context *ctx)
 uint32_t
 intel_aux_map_get_alignment(struct intel_aux_map_context *ctx)
 {
-   switch (ctx->format_enum) {
-   case INTEL_AUX_MAP_GFX12_64KB: return 64 * 1024;
-   case INTEL_AUX_MAP_GFX125_1MB: return 1 * 1024 * 1024;
-   default:                       unreachable("Invalid AUX map format");
-   }
+   return ctx->format->main_page_size;
 }
 
 uint64_t