From 5c5d2b1e9fd3279869c351fd5859ec655788c9cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Briano?= Date: Mon, 14 Jul 2025 11:24:24 -0700 Subject: [PATCH] anv: pass only isl_format to helper functions Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/vulkan/anv_image_host_copy.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/intel/vulkan/anv_image_host_copy.c b/src/intel/vulkan/anv_image_host_copy.c index 597ea1edba0..74c49bda32b 100644 --- a/src/intel/vulkan/anv_image_host_copy.c +++ b/src/intel/vulkan/anv_image_host_copy.c @@ -169,12 +169,12 @@ anv_copy_image_memory(struct anv_device *device, } static uint64_t -calc_mem_row_pitch_B(const struct isl_surf *surf, +calc_mem_row_pitch_B(enum isl_format format, uint64_t api_row_length_px, const VkExtent3D *extent_px) { const struct isl_format_layout *fmt_layout = - isl_format_get_layout(surf->format); + isl_format_get_layout(format); const uint32_t bs = fmt_layout->bpb / 8; return api_row_length_px != 0 ? @@ -183,13 +183,13 @@ calc_mem_row_pitch_B(const struct isl_surf *surf, } static uint64_t -calc_mem_height_pitch_B(const struct isl_surf *surf, +calc_mem_height_pitch_B(enum isl_format format, uint64_t row_pitch_B, uint64_t api_height_px, const VkExtent3D *extent_px) { const struct isl_format_layout *fmt_layout = - isl_format_get_layout(surf->format); + isl_format_get_layout(format); return api_height_px != 0 ? (row_pitch_B * DIV_ROUND_UP(api_height_px, fmt_layout->bh)) : @@ -222,11 +222,11 @@ anv_CopyMemoryToImageEXT( /* Memory distance between each row */ uint64_t mem_row_pitch_B = - calc_mem_row_pitch_B(surf, region->memoryRowLength, + calc_mem_row_pitch_B(surf->format, region->memoryRowLength, ®ion->imageExtent); /* Memory distance between each slice (1 3D level or 1 array layer) */ uint64_t mem_height_pitch_B = - calc_mem_height_pitch_B(surf, mem_row_pitch_B, + calc_mem_height_pitch_B(surf->format, mem_row_pitch_B, region->memoryImageHeight, ®ion->imageExtent); @@ -304,11 +304,11 @@ anv_CopyImageToMemoryEXT( /* Memory distance between each row */ uint64_t mem_row_pitch_B = - calc_mem_row_pitch_B(surf, region->memoryRowLength, + calc_mem_row_pitch_B(surf->format, region->memoryRowLength, ®ion->imageExtent); /* Memory distance between each slice (1 3D level or 1 array layer) */ uint64_t mem_height_pitch_B = - calc_mem_height_pitch_B(surf, mem_row_pitch_B, + calc_mem_height_pitch_B(surf->format, mem_row_pitch_B, region->memoryImageHeight, ®ion->imageExtent);