From e584fd894ed1b4497d668f7145c8514914d6ad8f Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 20 May 2019 07:33:14 -0600 Subject: [PATCH] nir: silence three compiler warnings seen with MinGW Silence two unused var warnings. And init elem_size, elem_align to zero to silence "maybe uninitialized" warnings. Reviewed-by: Kristian H. Kristensen --- src/compiler/nir/nir_lower_int_to_float.c | 2 +- src/compiler/nir/nir_opt_copy_prop_vars.c | 4 +--- src/compiler/nir_types.cpp | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/compiler/nir/nir_lower_int_to_float.c b/src/compiler/nir/nir_lower_int_to_float.c index e31644d..d0da60c 100644 --- a/src/compiler/nir/nir_lower_int_to_float.c +++ b/src/compiler/nir/nir_lower_int_to_float.c @@ -28,7 +28,7 @@ static bool assert_ssa_def_is_not_int(nir_ssa_def *def, void *arg) { - BITSET_WORD *int_types = arg; + MAYBE_UNUSED BITSET_WORD *int_types = arg; assert(!BITSET_TEST(int_types, def->index)); return true; } diff --git a/src/compiler/nir/nir_opt_copy_prop_vars.c b/src/compiler/nir/nir_opt_copy_prop_vars.c index 94bc8af..0fd96b7 100644 --- a/src/compiler/nir/nir_opt_copy_prop_vars.c +++ b/src/compiler/nir/nir_opt_copy_prop_vars.c @@ -433,9 +433,7 @@ load_element_from_ssa_entry_value(struct copy_prop_var_state *state, nir_builder *b, nir_intrinsic_instr *intrin, struct value *value, unsigned index) { - const struct glsl_type *type = entry->dst->type; - unsigned num_components = glsl_get_vector_elements(type); - assert(index < num_components); + assert(index < glsl_get_vector_elements(entry->dst->type)); /* We don't have the element available, so let the instruction do the work. */ if (!entry->src.ssa.def[index]) diff --git a/src/compiler/nir_types.cpp b/src/compiler/nir_types.cpp index 3bf93c5..e2dfc40 100644 --- a/src/compiler/nir_types.cpp +++ b/src/compiler/nir_types.cpp @@ -630,7 +630,7 @@ glsl_get_natural_size_align_bytes(const struct glsl_type *type, *size = 0; *align = 0; for (unsigned i = 0; i < type->length; i++) { - unsigned elem_size, elem_align; + unsigned elem_size = 0, elem_align = 0; glsl_get_natural_size_align_bytes(type->fields.structure[i].type, &elem_size, &elem_align); *align = MAX2(*align, elem_align); -- 2.7.4