Mesa (staging/21.0): tgsi_to_nir: Fix uniform ranges.

[GitLab Mirror]

Module: Mesa
Branch: staging/21.0
Commit: 37c4ed461f801788861d7ed82c82a79e428220f7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=37c4ed461f801788861d7ed82c82a79e428220f7

Author: Timur Kristóf <timur.kristof at gmail.com>
Date:   Mon Feb  8 17:58:15 2021 +0100

tgsi_to_nir: Fix uniform ranges.

Signed-off-by: Timur Kristóf <timur.kristof at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Fixes: f3b33a5a35e605101d45213bddf52f2f800a52bb
Closes: #4127
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8920>
(cherry picked from commit e163f1c9493c7eab4c6c5f86e3dbf5f097729c18)

---

 .pick_status.json                       | 2 +-
 src/gallium/auxiliary/nir/tgsi_to_nir.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index eb7285e9b4e..5c2a2d28e89 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4117,7 +4117,7 @@
         "description": "tgsi_to_nir: Fix uniform ranges.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "f3b33a5a35e605101d45213bddf52f2f800a52bb"
     },
diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index b58690bb1c3..5aa574d74fc 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,
          nir_intrinsic_set_base(load, index);
          if (indirect) {
             offset = ttn_src_for_indirect(c, indirect);
-            nir_intrinsic_set_range(load, c->ubo_sizes[0] - index);
+            nir_intrinsic_set_range(load, c->build.shader->num_uniforms * 16 - index);
          } else {
             offset = nir_imm_int(b, 0);
             nir_intrinsic_set_range(load, 1);