<div dir="ltr"><div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>></div><div><br></div><div>The only real difference is that the common one also handles casts. Would probably be good to handle them here too.</div><div><br></div><div>--Jason<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Jul 31, 2019 at 12:36 AM Dave Airlie <<a href="mailto:airlied@gmail.com">airlied@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">From: Dave Airlie <<a href="mailto:airlied@redhat.com" target="_blank">airlied@redhat.com</a>><br>
<br>
This doesn't seem to need it's own copy here.<br>
---<br>
src/compiler/nir/nir_lower_scratch.c | 16 +---------------<br>
1 file changed, 1 insertion(+), 15 deletions(-)<br>
<br>
diff --git a/src/compiler/nir/nir_lower_scratch.c b/src/compiler/nir/nir_lower_scratch.c<br>
index df0d3f43124..aacc2ddca08 100644<br>
--- a/src/compiler/nir/nir_lower_scratch.c<br>
+++ b/src/compiler/nir/nir_lower_scratch.c<br>
@@ -34,20 +34,6 @@<br>
#include "nir_builder.h"<br>
#include "nir_deref.h"<br>
<br>
-static bool<br>
-deref_has_indirect(nir_deref_instr *deref)<br>
-{<br>
- while (deref->deref_type != nir_deref_type_var) {<br>
- if (deref->deref_type == nir_deref_type_array &&<br>
- nir_src_as_const_value(deref->arr.index) == NULL)<br>
- return true;<br>
-<br>
- deref = nir_deref_instr_parent(deref);<br>
- }<br>
-<br>
- return false;<br>
-}<br>
-<br>
static void<br>
lower_load_store(nir_builder *b,<br>
nir_intrinsic_instr *intrin,<br>
@@ -128,7 +114,7 @@ nir_lower_vars_to_scratch(nir_shader *shader,<br>
if (!(deref->mode & modes))<br>
continue;<br>
<br>
- if (!deref_has_indirect(nir_src_as_deref(intrin->src[0])))<br>
+ if (!nir_deref_instr_has_indirect(nir_src_as_deref(intrin->src[0])))<br>
continue;<br>
<br>
nir_variable *var = nir_deref_instr_get_variable(deref);<br>
-- <br>
2.21.0<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a></blockquote></div>