nir: Add a combined alignment helper

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@colllabora.com>
Reviewed-by: M Henning <drawoc@darkrefraction.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21524>
This commit is contained in:
Faith Ekstrand
2023-02-27 08:33:02 -06:00
committed by Marge Bot
parent e433a7c4fa
commit ca4d73ba36
2 changed files with 19 additions and 7 deletions

View File

@@ -1267,9 +1267,7 @@ get_mem_access_size_align(nir_intrinsic_op intrin, uint8_t bytes,
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);
switch (intrin) {
case nir_intrinsic_load_ssbo: