[Mesa-dev] [PATCH 10/18] ac/nir: drop nir_to_llvm_context from visit_load_local_invocation_index()

Samuel Pitoiset samuel.pitoiset at gmail.com
Fri Feb 9 12:54:27 UTC 2018


Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 src/amd/common/ac_nir_to_llvm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 97b5ec90f7..1188708020 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -3898,14 +3898,14 @@ visit_load_helper_invocation(struct ac_nir_context *ctx)
 }
 
 static LLVMValueRef
-visit_load_local_invocation_index(struct nir_to_llvm_context *ctx)
+visit_load_local_invocation_index(struct ac_nir_context *ctx)
 {
 	LLVMValueRef result;
 	LLVMValueRef thread_id = ac_get_thread_id(&ctx->ac);
-	result = LLVMBuildAnd(ctx->builder, ctx->abi.tg_size,
+	result = LLVMBuildAnd(ctx->ac.builder, ctx->abi->tg_size,
 			      LLVMConstInt(ctx->ac.i32, 0xfc0, false), "");
 
-	return LLVMBuildAdd(ctx->builder, result, thread_id, "");
+	return LLVMBuildAdd(ctx->ac.builder, result, thread_id, "");
 }
 
 static LLVMValueRef visit_var_atomic(struct nir_to_llvm_context *ctx,
@@ -4376,7 +4376,7 @@ static void visit_intrinsic(struct ac_nir_context *ctx,
 		result = ctx->abi->num_work_groups;
 		break;
 	case nir_intrinsic_load_local_invocation_index:
-		result = visit_load_local_invocation_index(ctx->nctx);
+		result = visit_load_local_invocation_index(ctx);
 		break;
 	case nir_intrinsic_load_push_constant:
 		result = visit_load_push_constant(ctx->nctx, instr);
-- 
2.16.1



More information about the mesa-dev mailing list