<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Sep 8, 2016 at 11:21 AM, Jason Ekstrand <span dir="ltr"><<a href="mailto:jason@jlekstrand.net" target="_blank">jason@jlekstrand.net</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote"><span class="">On Thu, Sep 8, 2016 at 11:14 AM, Rob Clark <span dir="ltr"><<a href="mailto:robdclark@gmail.com" target="_blank">robdclark@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I want to re-use this in a different pass, so move to nir.h<br>
<br>
Signed-off-by: Rob Clark <<a href="mailto:robdclark@gmail.com" target="_blank">robdclark@gmail.com</a>><br>
---<br>
src/compiler/nir/nir.h | 16 ++++++++++++++++<br>
src/compiler/nir/nir_lower_te<wbr>x.c | 20 ++------------------<br>
2 files changed, 18 insertions(+), 18 deletions(-)<br>
<br>
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h<br>
index c1cf940..e907bc9 100644<br>
--- a/src/compiler/nir/nir.h<br>
+++ b/src/compiler/nir/nir.h<br>
@@ -2297,6 +2297,22 @@ unsigned nir_index_instrs(nir_function_<wbr>impl *impl);<br>
<br>
void nir_index_blocks(nir_function_<wbr>impl *impl);<br>
<br>
+static inline void<br>
+nir_tex_instr_remove_src(nir_<wbr>tex_instr *tex, unsigned src_idx)<br></blockquote><div><br></div></span><div>This one is complex enough, I think I'd rather have it in nir.c. That also allows us to put the declaration up with the other nir_tex_instr helpers which would be nice.<br></div></div></div></div></blockquote><div><br></div><div>With that fixed, both are<br><br></div><div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div></div><div><div class="h5"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+{<br>
+ assert(src_idx < tex->num_srcs);<br>
+<br>
+ /* First rewrite the source to NIR_SRC_INIT */<br>
+ nir_instr_rewrite_src(&tex->i<wbr>nstr, &tex->src[src_idx].src, NIR_SRC_INIT);<br>
+<br>
+ /* Now, move all of the other sources down */<br>
+ for (unsigned i = src_idx + 1; i < tex->num_srcs; i++) {<br>
+ tex->src[i-1].src_type = tex->src[i].src_type;<br>
+ nir_instr_move_src(&tex->instr<wbr>, &tex->src[i-1].src, &tex->src[i].src);<br>
+ }<br>
+ tex->num_srcs--;<br>
+}<br>
+<br>
void nir_print_shader(nir_shader *shader, FILE *fp);<br>
void nir_print_shader_annotated(nir<wbr>_shader *shader, FILE *fp, struct hash_table *errors);<br>
void nir_print_instr(const nir_instr *instr, FILE *fp);<br>
diff --git a/src/compiler/nir/nir_lower_t<wbr>ex.c b/src/compiler/nir/nir_lower_t<wbr>ex.c<br>
index b570598..a405758 100644<br>
--- a/src/compiler/nir/nir_lower_t<wbr>ex.c<br>
+++ b/src/compiler/nir/nir_lower_t<wbr>ex.c<br>
@@ -39,22 +39,6 @@<br>
#include "nir_builder.h"<br>
<br>
static void<br>
-tex_instr_remove_src(nir_tex_<wbr>instr *tex, unsigned src_idx)<br>
-{<br>
- assert(src_idx < tex->num_srcs);<br>
-<br>
- /* First rewrite the source to NIR_SRC_INIT */<br>
- nir_instr_rewrite_src(&tex->i<wbr>nstr, &tex->src[src_idx].src, NIR_SRC_INIT);<br>
-<br>
- /* Now, move all of the other sources down */<br>
- for (unsigned i = src_idx + 1; i < tex->num_srcs; i++) {<br>
- tex->src[i-1].src_type = tex->src[i].src_type;<br>
- nir_instr_move_src(&tex->instr<wbr>, &tex->src[i-1].src, &tex->src[i].src);<br>
- }<br>
- tex->num_srcs--;<br>
-}<br>
-<br>
-static void<br>
project_src(nir_builder *b, nir_tex_instr *tex)<br>
{<br>
/* Find the projector in the srcs list, if present. */<br>
@@ -114,7 +98,7 @@ project_src(nir_builder *b, nir_tex_instr *tex)<br>
nir_src_for_ssa(projected));<br>
}<br>
<br>
- tex_instr_remove_src(tex, proj_index);<br>
+ nir_tex_instr_remove_src(tex, proj_index);<br>
}<br>
<br>
static bool<br>
@@ -159,7 +143,7 @@ lower_offset(nir_builder *b, nir_tex_instr *tex)<br>
nir_instr_rewrite_src(&tex->in<wbr>str, &tex->src[coord_index].src,<br>
nir_src_for_ssa(offset_coord))<wbr>;<br>
<br>
- tex_instr_remove_src(tex, offset_index);<br>
+ nir_tex_instr_remove_src(tex, offset_index);<br>
<br>
return true;<br>
}<br>
<span><font color="#888888">--<br>
2.7.4<br>
<br>
</font></span></blockquote></div></div></div><br></div></div>
</blockquote></div><br></div></div>