From da93b13f8b617e1a8faecb98c7b0b60b7fdc8902 Mon Sep 17 00:00:00 2001
From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 10 Sep 2024 01:48:29 -0700
Subject: [PATCH] brw: Use nir_combined_align in brw_nir_should_vectorize_mem

Better than open-coding this.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32315>
---
 src/intel/compiler/brw_nir.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c
index 5d959710692..fd73429e578 100644
--- a/src/intel/compiler/brw_nir.c
+++ b/src/intel/compiler/brw_nir.c
@@ -1447,11 +1447,7 @@ brw_nir_should_vectorize_mem(unsigned align_mul, unsigned align_offset,
    }
 
 
-   uint32_t align;
-   if (align_offset)
-      align = 1 << (ffs(align_offset) - 1);
-   else
-      align = align_mul;
+   const uint32_t align = nir_combined_align(align_mul, align_offset);
 
    if (align < bit_size / 8)
       return false;