From 970c8dfd98e5e0b9f8f18424855f667c175b1c03 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Fri, 4 Nov 2022 15:13:28 +0800 Subject: [PATCH] r600: Fixes -Werror,-Wunused-but-set-variable for clang-15 one of the error messages: ../../src/gallium/drivers/r600/r600_asm.c:2528:8: error: variable 'o' set but not used [-Werror,-Wunused-but-set-variable] int o = 0; ^ Signed-off-by: Yonggang Luo Reviewed-by: Gert Wollny Part-of: --- src/gallium/drivers/r600/r600_asm.c | 2 +- src/gallium/drivers/r600/sb/sb_bc_parser.cpp | 2 +- src/gallium/drivers/r600/sb/sb_if_conversion.cpp | 2 +- src/gallium/drivers/r600/sb/sb_sched.cpp | 2 +- src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp | 4 ---- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c index 6a62bd4eaef..9d29d7759d9 100644 --- a/src/gallium/drivers/r600/r600_asm.c +++ b/src/gallium/drivers/r600/r600_asm.c @@ -2582,7 +2582,7 @@ void r600_bytecode_disasm(struct r600_bytecode *bc) } LIST_FOR_EACH_ENTRY(gds, &cf->gds, list) { - int o = 0; + UNUSED int o = 0; o += fprintf(stderr, " %04d %08X %08X %08X ", id, bc->bytecode[id], bc->bytecode[id + 1], bc->bytecode[id + 2]); diff --git a/src/gallium/drivers/r600/sb/sb_bc_parser.cpp b/src/gallium/drivers/r600/sb/sb_bc_parser.cpp index 446486c36ea..da27c2005d5 100644 --- a/src/gallium/drivers/r600/sb/sb_bc_parser.cpp +++ b/src/gallium/drivers/r600/sb/sb_bc_parser.cpp @@ -254,7 +254,7 @@ int bc_parser::decode_alu_clause(cf_node* cf) { cgroup = 0; memset(slots[0], 0, 5*sizeof(slots[0][0])); - unsigned ng = 0; + UNUSED unsigned ng = 0; do { decode_alu_group(cf, i, gcnt); diff --git a/src/gallium/drivers/r600/sb/sb_if_conversion.cpp b/src/gallium/drivers/r600/sb/sb_if_conversion.cpp index 48355e8d6e2..7452f1c8263 100644 --- a/src/gallium/drivers/r600/sb/sb_if_conversion.cpp +++ b/src/gallium/drivers/r600/sb/sb_if_conversion.cpp @@ -41,7 +41,7 @@ int if_conversion::run() { regions_vec &rv = sh.get_regions(); - unsigned converted = 0; + UNUSED unsigned converted = 0; for (regions_vec::reverse_iterator I = rv.rbegin(); I != rv.rend(); ) { region_node *r = *I; if (run_on(r)) { diff --git a/src/gallium/drivers/r600/sb/sb_sched.cpp b/src/gallium/drivers/r600/sb/sb_sched.cpp index e8a0e5a05c4..72dbb81b080 100644 --- a/src/gallium/drivers/r600/sb/sb_sched.cpp +++ b/src/gallium/drivers/r600/sb/sb_sched.cpp @@ -516,7 +516,7 @@ bool alu_group_tracker::try_reserve(alu_node* n) { gpr.reset(); slots[slot] = n; - unsigned forced_swz_slots = 0; + UNUSED unsigned forced_swz_slots = 0; int first_slot = ~0, first_nf = ~0, last_slot = ~0; unsigned save_bs[5]; diff --git a/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp b/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp index c95acaf4680..711125919ad 100644 --- a/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp @@ -489,10 +489,6 @@ TexInstr::emit_set_offsets( for (int i = 0; i < src_components; ++i) swizzle[i] = i; - int noffsets = tex->coord_components; - if (tex->is_array) - --noffsets; - auto ofs = shader.value_factory().src_vec4(*src.offset, pin_group, swizzle); RegisterVec4 empty_dst(0, false, {0, 0, 0, 0}, pin_group);