From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Mon, 12 Feb 2018 11:22:00 +0000 (+0100)
Subject: ac/nir: remove nir_to_llvm_context::nir link
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a541117ff4185b4c742e2d401bb4edd2c0c8031f;p=mesa.git

ac/nir: remove nir_to_llvm_context::nir link

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

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 80f5f00dc65..1001c80dc6c 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -68,7 +68,6 @@ struct nir_to_llvm_context {
 	const struct ac_nir_compiler_options *options;
 	struct ac_shader_variant_info *shader_info;
 	struct ac_shader_abi abi;
-	struct ac_nir_context *nir;
 
 	unsigned max_workgroup_size;
 	LLVMContextRef context;
@@ -6753,9 +6752,6 @@ void ac_nir_translate(struct ac_llvm_context *ac, struct ac_shader_abi *abi,
 	ctx.ac = *ac;
 	ctx.abi = abi;
 
-	if (nctx)
-		nctx->nir = &ctx;
-
 	ctx.stage = nir->info.stage;
 
 	ctx.main_function = LLVMGetBasicBlockParent(LLVMGetInsertBlock(ctx.ac.builder));
@@ -6788,9 +6784,6 @@ void ac_nir_translate(struct ac_llvm_context *ac, struct ac_shader_abi *abi,
 	ralloc_free(ctx.defs);
 	ralloc_free(ctx.phis);
 	ralloc_free(ctx.vars);
-
-	if (nctx)
-		nctx->nir = NULL;
 }
 
 static
@@ -7251,8 +7244,6 @@ void ac_create_gs_copy_shader(LLVMTargetMachineRef tm,
 	nir_ctx.ac = ctx.ac;
 	nir_ctx.abi = &ctx.abi;
 
-	ctx.nir = &nir_ctx;
-
 	nir_foreach_variable(variable, &geom_shader->outputs) {
 		scan_shader_output_decl(&ctx, variable, geom_shader, MESA_SHADER_VERTEX);
 		handle_shader_output_decl(&nir_ctx, geom_shader, variable);
@@ -7260,8 +7251,6 @@ void ac_create_gs_copy_shader(LLVMTargetMachineRef tm,
 
 	ac_gs_copy_shader_emit(&ctx);
 
-	ctx.nir = NULL;
-
 	LLVMBuildRetVoid(ctx.ac.builder);
 
 	ac_llvm_finalize_module(&ctx);