From: Brian Paul <brianp@vmware.com>
Date: Fri, 30 Mar 2018 04:02:37 +0000 (-0600)
Subject: nir: s/uint/unsigned/ to fix MSVC/MinGW build
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fc1d1dbe81e16041ec0d84811d171f7d42975eea;p=mesa.git

nir: s/uint/unsigned/ to fix MSVC/MinGW build

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Neha Bhende <bhenden@vmware.com>
---

diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp
index c4a6d52a5b2..dbb58d82e8f 100644
--- a/src/compiler/glsl/glsl_to_nir.cpp
+++ b/src/compiler/glsl/glsl_to_nir.cpp
@@ -369,7 +369,7 @@ nir_visitor::visit(ir_variable *ir)
       /* Mark all the locations that require two slots */
       if (shader->info.stage == MESA_SHADER_VERTEX &&
           glsl_type_is_dual_slot(glsl_without_array(var->type))) {
-         for (uint i = 0; i < glsl_count_attribute_slots(var->type, true); i++) {
+         for (unsigned i = 0; i < glsl_count_attribute_slots(var->type, true); i++) {
             uint64_t bitfield = BITFIELD64_BIT(var->data.location + i);
             shader->info.vs.double_inputs |= bitfield;
          }
diff --git a/src/compiler/nir/nir_gather_info.c b/src/compiler/nir/nir_gather_info.c
index 743f968035b..5530009255d 100644
--- a/src/compiler/nir/nir_gather_info.c
+++ b/src/compiler/nir/nir_gather_info.c
@@ -250,7 +250,7 @@ gather_intrinsic_info(nir_intrinsic_instr *instr, nir_shader *shader)
          if (shader->info.stage == MESA_SHADER_VERTEX &&
              var->data.mode == nir_var_shader_in &&
              glsl_type_is_dual_slot(glsl_without_array(var->type))) {
-            for (uint i = 0; i < glsl_count_attribute_slots(var->type, false); i++) {
+            for (unsigned i = 0; i < glsl_count_attribute_slots(var->type, false); i++) {
                int idx = var->data.location + i;
                shader->info.vs.double_inputs |= BITFIELD64_BIT(idx);
             }