From: Gert Wollny <gert.wollny@collabora.com>
Date: Wed, 15 Apr 2020 15:03:31 +0000 (+0200)
Subject: r600/sfn: Fix setting alignments when lowering UBOs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b51ced7306ea18df1c5ded700608f01db4f01e6d;p=mesa.git

r600/sfn: Fix setting alignments when lowering UBOs

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4609>
---

diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
index 856c386b549..9fc272c6089 100644
--- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
@@ -412,7 +412,7 @@ r600_lower_ubo_to_align16_impl(nir_builder *b, nir_instr *instr, void *_options)
    load->num_components = const_address ? op->num_components : 4;
    load->src[0] = op->src[0];
    load->src[1] = nir_src_for_ssa(new_offset);
-   nir_intrinsic_set_align(load, nir_intrinsic_align(op), nir_intrinsic_align_offset(op));
+   nir_intrinsic_set_align(load, nir_intrinsic_align_mul(op), nir_intrinsic_align_offset(op));
 
    nir_ssa_dest_init(&load->instr, &load->dest, load->num_components, 32, NULL);
    nir_builder_instr_insert(b, &load->instr);