Mesa (master): turnip: fix nir validate failure from push constant lowering

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: f03e63cd9964b8f2577538d02545794c199f1b62
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f03e63cd9964b8f2577538d02545794c199f1b62

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Tue Apr  7 21:39:40 2020 -0400

turnip: fix nir validate failure from push constant lowering

Fixes newly added checks in nir validate failing.

Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3783>

---

 src/freedreno/vulkan/tu_shader.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/freedreno/vulkan/tu_shader.c b/src/freedreno/vulkan/tu_shader.c
index bd52335093d..4a396ced9e7 100644
--- a/src/freedreno/vulkan/tu_shader.c
+++ b/src/freedreno/vulkan/tu_shader.c
@@ -215,6 +215,9 @@ lower_load_push_constant(nir_builder *b, nir_intrinsic_instr *instr,
 
    nir_intrinsic_instr *load =
       nir_intrinsic_instr_create(b->shader, nir_intrinsic_load_ubo);
+
+   nir_intrinsic_set_align(load, 4, 0);
+
    load->num_components = instr->num_components;
    load->src[0] = nir_src_for_ssa(nir_imm_int(b, 0));
    load->src[1] = instr->src[0];