Mesa (master): ac/nir: remove backlink to nir_to_llvm_context

Samuel Pitoiset hakzsam at kemper.freedesktop.org
Mon Feb 12 10:55:02 UTC 2018


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

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

ac/nir: remove backlink to nir_to_llvm_context

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 | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 771a9c8dd2..d04e24f600 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -46,8 +46,6 @@ enum radeon_llvm_calling_convention {
 #define RADEON_LLVM_MAX_INPUTS (VARYING_SLOT_VAR31 + 1)
 #define RADEON_LLVM_MAX_OUTPUTS (VARYING_SLOT_VAR31 + 1)
 
-struct nir_to_llvm_context;
-
 struct ac_nir_context {
 	struct ac_llvm_context ac;
 	struct ac_shader_abi *abi;
@@ -66,8 +64,6 @@ struct ac_nir_context {
 
 	int num_locals;
 	LLVMValueRef *locals;
-
-	struct nir_to_llvm_context *nctx; /* TODO get rid of this */
 };
 
 struct nir_to_llvm_context {
@@ -6679,7 +6675,6 @@ void ac_nir_translate(struct ac_llvm_context *ac, struct ac_shader_abi *abi,
 	ctx.ac = *ac;
 	ctx.abi = abi;
 
-	ctx.nctx = nctx;
 	if (nctx)
 		nctx->nir = &ctx;
 
@@ -7178,7 +7173,6 @@ void ac_create_gs_copy_shader(LLVMTargetMachineRef tm,
 	nir_ctx.ac = ctx.ac;
 	nir_ctx.abi = &ctx.abi;
 
-	nir_ctx.nctx = &ctx;
 	ctx.nir = &nir_ctx;
 
 	nir_foreach_variable(variable, &geom_shader->outputs) {




More information about the mesa-commit mailing list