Mesa (master): nir: fix shift for uint64_t

Timothy Arceri tarceri at kemper.freedesktop.org
Wed Dec 13 02:20:42 UTC 2017


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

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Tue Dec 12 13:52:50 2017 +1100

nir: fix shift for uint64_t

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/compiler/nir/nir_lower_io_arrays_to_elements.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/nir/nir_lower_io_arrays_to_elements.c b/src/compiler/nir/nir_lower_io_arrays_to_elements.c
index dca5719f11..cdf9a76a88 100644
--- a/src/compiler/nir/nir_lower_io_arrays_to_elements.c
+++ b/src/compiler/nir/nir_lower_io_arrays_to_elements.c
@@ -247,7 +247,7 @@ create_indirects_mask(nir_shader *shader, uint64_t *indirects,
                if (var->data.mode != mode)
                   continue;
 
-               uint64_t loc_mask = 1 << var->data.location;
+               uint64_t loc_mask = ((uint64_t)1) << var->data.location;
                if (var->data.patch) {
                   if (deref_has_indirect(&b, var, intr->variables[0]))
                      patch_indirects[var->data.location_frac] |= loc_mask;
@@ -289,7 +289,7 @@ lower_io_arrays_to_elements(nir_shader *shader, nir_variable_mode mask,
                nir_variable *var = intr->variables[0]->var;
 
                /* Skip indirects */
-               uint64_t loc_mask = 1 << var->data.location;
+               uint64_t loc_mask = ((uint64_t)1) << var->data.location;
                if (var->data.patch) {
                   if (patch_indirects[var->data.location_frac] & loc_mask)
                      continue;




More information about the mesa-commit mailing list