Mesa (master): ac/nir: drop nir_to_llvm_context from visit_load_push_constant()

[Samuel Pitoiset]

Module: Mesa
Branch: master
Commit: cd6dfacda9063fdc41f48b86470f50ba5a9e79ae
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd6dfacda9063fdc41f48b86470f50ba5a9e79ae

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Fri Feb  9 13:54:29 2018 +0100

ac/nir: drop nir_to_llvm_context from visit_load_push_constant()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/amd/common/ac_nir_to_llvm.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index d1fa26f2b2..13fa22d444 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -2393,18 +2393,19 @@ static LLVMValueRef visit_vulkan_resource_reindex(struct nir_to_llvm_context *ct
 	return result;
 }
 
-static LLVMValueRef visit_load_push_constant(struct nir_to_llvm_context *ctx,
+static LLVMValueRef visit_load_push_constant(struct ac_nir_context *ctx,
                                              nir_intrinsic_instr *instr)
 {
 	LLVMValueRef ptr, addr;
 
 	addr = LLVMConstInt(ctx->ac.i32, nir_intrinsic_base(instr), 0);
-	addr = LLVMBuildAdd(ctx->builder, addr, get_src(ctx->nir, instr->src[0]), "");
+	addr = LLVMBuildAdd(ctx->ac.builder, addr,
+			    get_src(ctx, instr->src[0]), "");
 
-	ptr = ac_build_gep0(&ctx->ac, ctx->abi.push_constants, addr);
-	ptr = cast_ptr(&ctx->ac, ptr, get_def_type(ctx->nir, &instr->dest.ssa));
+	ptr = ac_build_gep0(&ctx->ac, ctx->abi->push_constants, addr);
+	ptr = cast_ptr(&ctx->ac, ptr, get_def_type(ctx, &instr->dest.ssa));
 
-	return LLVMBuildLoad(ctx->builder, ptr, "");
+	return LLVMBuildLoad(ctx->ac.builder, ptr, "");
 }
 
 static LLVMValueRef visit_get_buffer_size(struct ac_nir_context *ctx,
@@ -4380,7 +4381,7 @@ static void visit_intrinsic(struct ac_nir_context *ctx,
 		result = visit_load_local_invocation_index(ctx);
 		break;
 	case nir_intrinsic_load_push_constant:
-		result = visit_load_push_constant(ctx->nctx, instr);
+		result = visit_load_push_constant(ctx, instr);
 		break;
 	case nir_intrinsic_vulkan_resource_index: {
 		LLVMValueRef index = get_src(ctx, instr->src[0]);