Mesa (master): nir: Update shader info when adding discards
Eric Anholt
anholt at kemper.freedesktop.org
Mon Aug 29 18:14:49 UTC 2016
Module: Mesa
Branch: master
Commit: a99d70d105df8a20f3ea98640afdeab7ed69b685
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a99d70d105df8a20f3ea98640afdeab7ed69b685
Author: Eric Anholt <eric at anholt.net>
Date: Fri Aug 26 13:45:47 2016 -0700
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 <jason at jlekstrand.net>
---
src/compiler/nir/nir_lower_bitmap.c | 2 ++
src/compiler/nir/nir_lower_clip.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/compiler/nir/nir_lower_bitmap.c b/src/compiler/nir/nir_lower_bitmap.c
index bd5c30f..216bedf 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 80db653..b74e6cc 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;
}
}
}
More information about the mesa-commit
mailing list