Mesa (main): ac/llvm: adjust assertion for nir_intrinsic_terminate
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Aug 31 09:01:33 UTC 2021
Module: Mesa
Branch: main
Commit: e72c2e36e096f6912ca958ee25470af2cb1ae8ce
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e72c2e36e096f6912ca958ee25470af2cb1ae8ce
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Thu Apr 22 10:25:10 2021 +0200
ac/llvm: adjust assertion for nir_intrinsic_terminate
Fixes dEQP-VK.spirv_assembly.instruction.terminate*.
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12616>
---
src/amd/llvm/ac_nir_to_llvm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/amd/llvm/ac_nir_to_llvm.c b/src/amd/llvm/ac_nir_to_llvm.c
index f0f22a64624..821b96c520c 100644
--- a/src/amd/llvm/ac_nir_to_llvm.c
+++ b/src/amd/llvm/ac_nir_to_llvm.c
@@ -2821,7 +2821,8 @@ static void emit_discard(struct ac_nir_context *ctx, const nir_intrinsic_instr *
instr->intrinsic == nir_intrinsic_terminate_if) {
cond = LLVMBuildNot(ctx->ac.builder, get_src(ctx, instr->src[0]), "");
} else {
- assert(instr->intrinsic == nir_intrinsic_discard);
+ assert(instr->intrinsic == nir_intrinsic_discard ||
+ instr->intrinsic == nir_intrinsic_terminate);
cond = ctx->ac.i1false;
}
More information about the mesa-commit
mailing list