From fc3ce007919ce6ef33653dd1d666bf9e34b0cd5c Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Sat, 2 Jan 2021 09:13:30 +0100 Subject: [PATCH] intel/blorp: use intrinsic builders Signed-off-by: Christian Gmeiner Reviewed-by: Jason Ekstrand Part-of: --- src/intel/blorp/blorp_blit.c | 6 +----- src/intel/blorp/blorp_clear.c | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c index 4e2b66e0979..76693635556 100644 --- a/src/intel/blorp/blorp_blit.c +++ b/src/intel/blorp/blorp_blit.c @@ -125,11 +125,7 @@ blorp_nir_discard_if_outside_rect(nir_builder *b, nir_ssa_def *pos, c3 = nir_uge(b, nir_channel(b, pos, 1), dst_y1); nir_ssa_def *oob = nir_ior(b, nir_ior(b, c0, c1), nir_ior(b, c2, c3)); - - nir_intrinsic_instr *discard = - nir_intrinsic_instr_create(b->shader, nir_intrinsic_discard_if); - discard->src[0] = nir_src_for_ssa(oob); - nir_builder_instr_insert(b, &discard->instr); + nir_discard_if(b, oob); } static nir_tex_instr * diff --git a/src/intel/blorp/blorp_clear.c b/src/intel/blorp/blorp_clear.c index 26f7d85ce1e..69d1a3ffc1e 100644 --- a/src/intel/blorp/blorp_clear.c +++ b/src/intel/blorp/blorp_clear.c @@ -1162,10 +1162,7 @@ blorp_params_get_mcs_partial_resolve_kernel(struct blorp_batch *batch, blorp_nir_mcs_is_clear_color(&b, mcs, blorp_key.num_samples); /* If we aren't the clear value, discard. */ - nir_intrinsic_instr *discard = - nir_intrinsic_instr_create(b.shader, nir_intrinsic_discard_if); - discard->src[0] = nir_src_for_ssa(nir_inot(&b, is_clear)); - nir_builder_instr_insert(&b, &discard->instr); + nir_discard_if(&b, nir_inot(&b, is_clear)); nir_ssa_def *clear_color = nir_load_var(&b, v_color); if (blorp_key.indirect_clear_color && blorp->isl_dev->info->gen <= 8) {