From 0e25746dde6c43cc3ff020f3db56517041915c99 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 26 Feb 2020 17:00:19 -0500 Subject: [PATCH] gallivm: fix 5 warnings Reviewed-by: Eric Anholt Part-of: --- src/gallium/auxiliary/gallivm/lp_bld_format_soa.c | 4 ++-- src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c | 2 +- src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_format_soa.c index 673ba2a..69e3185 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_format_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_format_soa.c @@ -873,7 +873,7 @@ lp_build_insert_soa_chan(struct lp_build_context *bld, struct lp_type type = bld->type; const unsigned width = chan_desc.size; const unsigned start = chan_desc.shift; - const unsigned stop = start + width; + ASSERTED const unsigned stop = start + width; LLVMValueRef chan = NULL; switch(chan_desc.type) { case UTIL_FORMAT_TYPE_UNSIGNED: @@ -985,7 +985,7 @@ lp_build_store_rgba_soa(struct gallivm_state *gallivm, { enum pipe_format format = format_desc->format; LLVMValueRef packed[4]; - unsigned num_stores; + unsigned num_stores = 0; memset(packed, 0, sizeof(LLVMValueRef) * 4); if (format_desc->layout == UTIL_FORMAT_LAYOUT_PLAIN && diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c index 7e4f73f..719e9f0 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c @@ -1368,7 +1368,7 @@ end_primitive_masked(struct lp_build_nir_context * bld_base, static void end_primitive(struct lp_build_nir_context *bld_base, uint32_t stream_id) { - struct lp_build_nir_soa_context *bld = (struct lp_build_nir_soa_context *)bld_base; + ASSERTED struct lp_build_nir_soa_context *bld = (struct lp_build_nir_soa_context *)bld_base; assert(bld->gs_iface->end_primitive); diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c index d884c2d..5895fa9 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c @@ -3377,6 +3377,7 @@ static void target_to_dims_layer(unsigned target, break; default: assert(0); + *dims = 0; return; } } @@ -3743,7 +3744,7 @@ atomic_emit( unsigned buf = bufreg->Register.Index; bool is_shared = bufreg->Register.File == TGSI_FILE_MEMORY; - LLVMAtomicRMWBinOp op; + LLVMAtomicRMWBinOp op = -1; switch (emit_data->inst->Instruction.Opcode) { case TGSI_OPCODE_ATOMUADD: op = LLVMAtomicRMWBinOpAdd; -- 2.7.4