Module: Mesa Branch: main Commit: b565b429914b7c902371c9059ebf4e2af05a00bb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b565b429914b7c902371c9059ebf4e2af05a00bb
Author: M Henning <[email protected]> Date: Thu Nov 23 14:22:52 2023 -0500 nak: Use nir_combined_align Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26347> --- src/nouveau/compiler/nak_nir.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/nouveau/compiler/nak_nir.c b/src/nouveau/compiler/nak_nir.c index 0f60ff92382..4c808173860 100644 --- a/src/nouveau/compiler/nak_nir.c +++ b/src/nouveau/compiler/nak_nir.c @@ -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;
