From: Eric Anholt Date: Fri, 26 Aug 2016 20:45:47 +0000 (-0700) Subject: nir: Update shader info when adding discards X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a99d70d105df8a20f3ea98640afdeab7ed69b685;p=mesa.git nir: Update shader info when adding discards vc4 is about to start using the shader info field to set up discard handling. Reviewed-by: Jason Ekstrand --- diff --git a/src/compiler/nir/nir_lower_bitmap.c b/src/compiler/nir/nir_lower_bitmap.c index bd5c30f8dc1..216bedf5740 100644 --- a/src/compiler/nir/nir_lower_bitmap.c +++ b/src/compiler/nir/nir_lower_bitmap.c @@ -107,6 +107,8 @@ lower_bitmap(nir_shader *shader, nir_builder *b, discard = nir_intrinsic_instr_create(shader, nir_intrinsic_discard_if); discard->src[0] = nir_src_for_ssa(cond); nir_builder_instr_insert(b, &discard->instr); + + shader->info.fs.uses_discard = true; } static void diff --git a/src/compiler/nir/nir_lower_clip.c b/src/compiler/nir/nir_lower_clip.c index 80db653a428..b74e6cca39f 100644 --- a/src/compiler/nir/nir_lower_clip.c +++ b/src/compiler/nir/nir_lower_clip.c @@ -286,6 +286,8 @@ lower_clip_fs(nir_function_impl *impl, unsigned ucp_enables, nir_intrinsic_discard_if); discard->src[0] = nir_src_for_ssa(cond); nir_builder_instr_insert(&b, &discard->instr); + + b.shader->info.fs.uses_discard = true; } } }