From: Rob Clark <robdclark@chromium.org>
Date: Thu, 2 May 2019 21:48:41 +0000 (-0700)
Subject: nir: fix nir tex print harder
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b73dd91f60871a12a8e8e887a6ccb98d15ea97a0;p=mesa.git

nir: fix nir tex print harder

Fixes: 691d5a825a6 nir: rework tex instruction printing
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Rob Clark <robdclark@chromium.org>
---

diff --git a/src/compiler/nir/nir_print.c b/src/compiler/nir/nir_print.c
index 46995766974..4056bd77455 100644
--- a/src/compiler/nir/nir_print.c
+++ b/src/compiler/nir/nir_print.c
@@ -914,14 +914,13 @@ print_tex_instr(nir_tex_instr *instr, print_state *state)
 
    bool has_texture_deref = false, has_sampler_deref = false;
    for (unsigned i = 0; i < instr->num_srcs; i++) {
-      print_src(&instr->src[i].src, state);
-
-      if (i == 0) {
-         fprintf(fp, " ");
-      } else {
+      if (i > 0) {
          fprintf(fp, ", ");
       }
 
+      print_src(&instr->src[i].src, state);
+      fprintf(fp, " ");
+
       switch(instr->src[i].src_type) {
       case nir_tex_src_coord:
          fprintf(fp, "(coord)");
@@ -987,7 +986,7 @@ print_tex_instr(nir_tex_instr *instr, print_state *state)
    }
 
    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)) {