summaryrefslogtreecommitdiffstats
path: root/src/compiler/nir
diff options
context:
space:
mode:
authorRob Clark <[email protected]>2019-04-28 08:06:12 -0700
committerRob Clark <[email protected]>2019-05-02 11:19:22 -0700
commit691d5a825a633fea81af9f83828d5d526ac6b22d (patch)
treed0a809986ae3636c537b4f06a5da390e55dfe9ee /src/compiler/nir
parentca3eb5db665cbcc2de5a5d3158e3dc68f86e5822 (diff)
nir: rework tex instruction printing
The extra comma at the end was annoying me. Signed-off-by: Rob Clark <[email protected]> Reviewed-by: Kristian H. Kristensen <[email protected]>
Diffstat (limited to 'src/compiler/nir')
-rw-r--r--src/compiler/nir/nir_print.c18
1 files 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);
}
}