Reviewed-by: Caio Marcelo de Oliveira Filho <caio.olive...@intel.com> --- src/compiler/nir/nir_opt_peephole_select.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/compiler/nir/nir_opt_peephole_select.c b/src/compiler/nir/nir_opt_peephole_select.c index 24a232e..608701a 100644 --- a/src/compiler/nir/nir_opt_peephole_select.c +++ b/src/compiler/nir/nir_opt_peephole_select.c @@ -77,6 +77,17 @@ block_check_for_allowed_instrs(nir_block *block, unsigned *count, bool alu_ok) } break; + case nir_intrinsic_load_deref: + switch (nir_src_as_deref(intrin->src[0])->mode) { + case nir_var_shader_in: + case nir_var_uniform: + break; + + default: + return false; + } + break; + case nir_intrinsic_load_uniform: if (!alu_ok) return false; @@ -255,8 +266,6 @@ nir_opt_peephole_select(nir_shader *shader, unsigned limit) { bool progress = false; - nir_assert_lowered_derefs(shader, nir_lower_load_store_derefs); - nir_foreach_function(function, shader) { if (function->impl) progress |= nir_opt_peephole_select_impl(function->impl, limit); -- 2.5.0.400.gff86faf _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev