OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: rework tex instruction printing

Browse Source 
The extra comma at the end was annoying me.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
This commit is contained in:
Rob Clark
2019-04-28 08:06:12 -07:00
parent ca3eb5db66
commit 691d5a825a
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/compiler/nir/nir_print.c
View File

@@ -913,7 +913,11 @@ print_tex_instr(nir_tex_instr *instr, print_state *state)
for (unsigned i = 0; i < instr->num_srcs; i++) { for (unsigned i = 0; i < instr->num_srcs; i++) {
print_src(&instr->src[i].src, state); print_src(&instr->src[i].src, state);
fprintf(fp, " "); if (i == 0) {
fprintf(fp, " ");
} else {
fprintf(fp, ", ");
}
switch(instr->src[i].src_type) { switch(instr->src[i].src_type) {
case nir_tex_src_coord: case nir_tex_src_coord:
@@ -977,28 +981,26 @@ print_tex_instr(nir_tex_instr *instr, print_state *state)
unreachable("Invalid texture source type"); unreachable("Invalid texture source type");
break; break;
} }
fprintf(fp, ", ");
} }
if (instr->op == nir_texop_tg4) { 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)) { 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) for (unsigned i = 1; i < 4; ++i)
fprintf(fp, ", (%i, %i)", instr->tg4_offsets[i][0], fprintf(fp, ", (%i, %i)", instr->tg4_offsets[i][0],
instr->tg4_offsets[i][1]); instr->tg4_offsets[i][1]);
fprintf(fp, " } (offsets), "); fprintf(fp, " } (offsets)");
} }
if (!has_texture_deref) { if (!has_texture_deref) {
fprintf(fp, "%u (texture), ", instr->texture_index); fprintf(fp, ", %u (texture)", instr->texture_index);
} }
if (!has_sampler_deref) { if (!has_sampler_deref) {
fprintf(fp, "%u (sampler), ", instr->sampler_index); fprintf(fp, ", %u (sampler)", instr->sampler_index);
} }
} }