From 8e20875651ce9c4484262da8b5ffc5c8ce2801e3 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 9 Jan 2025 15:25:33 -0500 Subject: [PATCH] ail: extract a blocksize helper Signed-off-by: Alyssa Rosenzweig Part-of: --- src/asahi/layout/layout.h | 6 ++++++ src/asahi/layout/tiling.cc | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/asahi/layout/layout.h b/src/asahi/layout/layout.h index 63f5e2b46ae..68763f41af8 100644 --- a/src/asahi/layout/layout.h +++ b/src/asahi/layout/layout.h @@ -257,6 +257,12 @@ ail_space_bits(unsigned x) #define MOD_POT(x, y) (x) & ((y) - 1) +static inline uint32_t +ail_get_blocksize_B(const struct ail_layout *layout) +{ + return util_format_get_blocksize(layout->format); +} + static inline unsigned ail_effective_width_sa(unsigned width_px, unsigned sample_count_sa) { diff --git a/src/asahi/layout/tiling.cc b/src/asahi/layout/tiling.cc index b840976c78b..f5572bbd7e3 100644 --- a/src/asahi/layout/tiling.cc +++ b/src/asahi/layout/tiling.cc @@ -163,7 +163,7 @@ ail_tile(void *_tiled, void *_linear, const struct ail_layout *tiled_layout, { unsigned width_px = u_minify(tiled_layout->width_px, level); unsigned height_px = u_minify(tiled_layout->height_px, level); - unsigned blocksize_B = util_format_get_blocksize(tiled_layout->format); + unsigned blocksize_B = ail_get_blocksize_B(tiled_layout); assert(level < tiled_layout->levels && "Mip level out of bounds"); assert(ail_is_level_twiddled_uncompressed(tiled_layout, level) &&