From f1883cc73d4ea2c6d3a73dfe55c8b346f3ef8ac6 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 30 Mar 2020 23:00:15 -0500 Subject: [PATCH] iris: Set alignments on cbuf0 and constant reads Reviewed-by: Ian Romanick Part-of: --- src/gallium/drivers/iris/iris_program.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c index de335cd9803..436c7b81551 100644 --- a/src/gallium/drivers/iris/iris_program.c +++ b/src/gallium/drivers/iris/iris_program.c @@ -432,6 +432,9 @@ iris_setup_uniforms(const struct brw_compiler *compiler, load_ubo->num_components = intrin->num_components; load_ubo->src[0] = nir_src_for_ssa(temp_const_ubo_name); load_ubo->src[1] = nir_src_for_ssa(offset); + nir_intrinsic_set_align(load_ubo, + nir_intrinsic_align_mul(intrin), + nir_intrinsic_align_offset(intrin)); nir_ssa_dest_init(&load_ubo->instr, &load_ubo->dest, intrin->dest.ssa.num_components, intrin->dest.ssa.bit_size, @@ -524,6 +527,7 @@ iris_setup_uniforms(const struct brw_compiler *compiler, load->num_components = comps; load->src[0] = nir_src_for_ssa(temp_ubo_name); load->src[1] = nir_src_for_ssa(offset); + nir_intrinsic_set_align(load, 4, 0); nir_ssa_dest_init(&load->instr, &load->dest, comps, 32, NULL); nir_builder_instr_insert(&b, &load->instr); nir_ssa_def_rewrite_uses(&intrin->dest.ssa,