From 691d5a825a633fea81af9f83828d5d526ac6b22d Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Sun, 28 Apr 2019 08:06:12 -0700 Subject: [PATCH] nir: rework tex instruction printing The extra comma at the end was annoying me. Signed-off-by: Rob Clark Reviewed-by: Kristian H. Kristensen --- src/compiler/nir/nir_print.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/compiler/nir/nir_print.c b/src/compiler/nir/nir_print.c index dc802bbe5e4..be36469fecb 100644 --- a/src/compiler/nir/nir_print.c +++ b/src/compiler/nir/nir_print.c @@ -913,7 +913,11 @@ print_tex_instr(nir_tex_instr *instr, print_state *state) for (unsigned i = 0; i < instr->num_srcs; i++) { print_src(&instr->src[i].src, state); - fprintf(fp, " "); + if (i == 0) { + fprintf(fp, " "); + } else { + fprintf(fp, ", "); + } switch(instr->src[i].src_type) { case nir_tex_src_coord: @@ -977,28 +981,26 @@ print_tex_instr(nir_tex_instr *instr, print_state *state) unreachable("Invalid texture source type"); break; } - - fprintf(fp, ", "); } if (instr->op == nir_texop_tg4) { - fprintf(fp, "%u (gather_component), ", instr->component); + fprintf(fp, ", %u (gather_component), ", instr->component); } if (nir_tex_instr_has_explicit_tg4_offsets(instr)) { - fprintf(fp, "{ (%i, %i)", instr->tg4_offsets[0][0], instr->tg4_offsets[0][1]); + fprintf(fp, ", { (%i, %i)", instr->tg4_offsets[0][0], instr->tg4_offsets[0][1]); for (unsigned i = 1; i < 4; ++i) fprintf(fp, ", (%i, %i)", instr->tg4_offsets[i][0], instr->tg4_offsets[i][1]); - fprintf(fp, " } (offsets), "); + fprintf(fp, " } (offsets)"); } if (!has_texture_deref) { - fprintf(fp, "%u (texture), ", instr->texture_index); + fprintf(fp, ", %u (texture)", instr->texture_index); } if (!has_sampler_deref) { - fprintf(fp, "%u (sampler), ", instr->sampler_index); + fprintf(fp, ", %u (sampler)", instr->sampler_index); } } -- 2.30.2