<p dir="ltr">Reviewed-by: Jason Ekstrand <<a href="mailto:jason.ekstrand@intel.com">jason.ekstrand@intel.com</a>></p>
<div class="gmail_quote">On Feb 10, 2015 11:24 AM, "Matt Turner" <<a href="mailto:mattst88@gmail.com">mattst88@gmail.com</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">---<br>
src/glsl/nir/nir_lower_samplers.cpp | 4 ----<br>
1 file changed, 4 deletions(-)<br>
<br>
diff --git a/src/glsl/nir/nir_lower_samplers.cpp b/src/glsl/nir/nir_lower_samplers.cpp<br>
index dca086d..3015dbd 100644<br>
--- a/src/glsl/nir/nir_lower_samplers.cpp<br>
+++ b/src/glsl/nir/nir_lower_samplers.cpp<br>
@@ -69,7 +69,6 @@ lower_sampler(nir_tex_instr *instr, struct gl_shader_program *shader_program,<br>
<br>
/* Get the name and the offset */<br>
instr->sampler_index = 0;<br>
- bool has_indirect = false;<br>
char *name = ralloc_strdup(mem_ctx, instr->sampler->var->name);<br>
<br>
for (nir_deref *deref = &instr->sampler->deref;<br>
@@ -82,7 +81,6 @@ lower_sampler(nir_tex_instr *instr, struct gl_shader_program *shader_program,<br>
* thing we have. This should be ok for now as we don't support<br>
* arrays_of_arrays yet.<br>
*/<br>
- assert(!has_indirect);<br>
<br>
instr->sampler_index *= glsl_get_length(deref->type);<br>
switch (deref_array->deref_array_type) {<br>
@@ -92,8 +90,6 @@ lower_sampler(nir_tex_instr *instr, struct gl_shader_program *shader_program,<br>
ralloc_asprintf_append(&name, "[%u]", deref_array->base_offset);<br>
break;<br>
case nir_deref_array_type_indirect: {<br>
- assert(!has_indirect);<br>
-<br>
instr->src = reralloc(mem_ctx, instr->src, nir_tex_src,<br>
instr->num_srcs + 1);<br>
memset(&instr->src[instr->num_srcs], 0, sizeof *instr->src);<br>
--<br>
2.0.5<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</blockquote></div>