From aa66fec47e6139ff50959b1326d621f2213ccc06 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Sat, 24 Jun 2017 18:40:17 +0200 Subject: [PATCH] ac/nir: pass ac_nir_context to emit_discard_if MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/amd/common/ac_nir_to_llvm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index ecddb5e9b9b..47f17b2f65c 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -3623,18 +3623,18 @@ static void emit_barrier(struct nir_to_llvm_context *ctx) ctx->voidt, NULL, 0, AC_FUNC_ATTR_CONVERGENT); } -static void emit_discard_if(struct nir_to_llvm_context *ctx, +static void emit_discard_if(struct ac_nir_context *ctx, const nir_intrinsic_instr *instr) { LLVMValueRef cond; - cond = LLVMBuildICmp(ctx->builder, LLVMIntNE, - get_src(ctx->nir, instr->src[0]), - ctx->i32zero, ""); + cond = LLVMBuildICmp(ctx->ac.builder, LLVMIntNE, + get_src(ctx, instr->src[0]), + ctx->ac.i32_0, ""); - cond = LLVMBuildSelect(ctx->builder, cond, - LLVMConstReal(ctx->f32, -1.0f), - ctx->f32zero, ""); + cond = LLVMBuildSelect(ctx->ac.builder, cond, + LLVMConstReal(ctx->ac.f32, -1.0f), + ctx->ac.f32_0, ""); ac_build_kill(&ctx->ac, cond); } @@ -4090,7 +4090,7 @@ static void visit_intrinsic(struct ac_nir_context *ctx, NULL, 0, AC_FUNC_ATTR_LEGACY); break; case nir_intrinsic_discard_if: - emit_discard_if(ctx->nctx, instr); + emit_discard_if(ctx, instr); break; case nir_intrinsic_memory_barrier: emit_waitcnt(ctx->nctx, VM_CNT); -- 2.30.2