Mesa (master): nir: fix a couple signed/unsigned comparison warnings in nir_builder.h

[GitLab Mirror]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Nov 11 16:43:45 2019 -0700

nir: fix a couple signed/unsigned comparison warnings in nir_builder.h

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

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

diff --git a/src/compiler/nir/nir_builder.h b/src/compiler/nir/nir_builder.h
index de00fe7e389..aed47593826 100644
--- a/src/compiler/nir/nir_builder.h
+++ b/src/compiler/nir/nir_builder.h
@@ -782,7 +782,7 @@ nir_extract_bits(nir_builder *b, nir_ssa_def **srcs, unsigned num_srcs,
    for (unsigned i = 0; i < num_srcs; i++)
       common_bit_size = MIN2(common_bit_size, srcs[i]->bit_size);
    if (first_bit > 0)
-      common_bit_size = MIN2(common_bit_size, (1 << (ffs(first_bit) - 1)));
+      common_bit_size = MIN2(common_bit_size, (1u << (ffs(first_bit) - 1)));
 
    /* We don't want to have to deal with 1-bit values */
    assert(common_bit_size >= 8);
@@ -800,7 +800,7 @@ nir_extract_bits(nir_builder *b, nir_ssa_def **srcs, unsigned num_srcs,
       const unsigned bit = first_bit + (i * common_bit_size);
       while (bit >= src_end_bit) {
          src_idx++;
-         assert(src_idx < num_srcs);
+         assert(src_idx < (int) num_srcs);
          src_start_bit = src_end_bit;
          src_end_bit += srcs[src_idx]->bit_size *
                         srcs[src_idx]->num_components;