From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Fri, 16 Jun 2023 17:43:19 +0000 (+0200)
Subject: gallium: use imm-helpers
X-Git-Tag: upstream/23.3.3~6341
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d8c458e8f4becbc6c53632ec605ed102fa59b1b;p=platform%2Fupstream%2Fmesa.git

gallium: use imm-helpers

Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23855>
---

diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index 6f0d3ef..1ba7119 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -739,7 +739,7 @@ ttn_src_for_file_and_index(struct ttn_compile *c, unsigned file, unsigned index,
             offset = nir_iadd(b, offset, ttn_src_for_indirect(c, indirect));
          }
          /* UBO offsets are in bytes, but TGSI gives them to us in vec4's */
-         offset = nir_ishl(b, offset, nir_imm_int(b, 4));
+         offset = nir_ishl_imm(b, offset, 4);
          nir_intrinsic_set_align(load, 16, 0);
 
          /* Set a very conservative base/range of the access: 16 bytes if not