nak: Use nir_combined_align

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26347>
2023-11-23 14:22:52 -05:00
parent 6797b6ba45
commit b565b42991
1 changed files with 1 additions and 3 deletions
@@ -971,9 +971,7 @@ nak_mem_access_size_align(nir_intrinsic_op intrin,
                          uint32_t align_mul, uint32_t align_offset,
                          bool offset_is_const, const void *cb_data)
 {
-   assert(align_offset < align_mul);
-   const uint32_t align =
-      align_offset ? 1 << (ffs(align_offset) - 1) : align_mul;
+   const uint32_t align = nir_combined_align(align_mul, align_offset);
   assert(util_is_power_of_two_nonzero(align));

   unsigned bytes_pow2;