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

Author: Samuel Pitoiset <samuel.pitoi...@gmail.com>
Date:   Mon Feb 12 12:31:59 2018 +0100

ac: remove nir_to_llvm_context from ac_nir_translate()

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

---

 src/amd/common/ac_nir_to_llvm.c              | 4 ++--
 src/amd/common/ac_nir_to_llvm.h              | 3 +--
 src/gallium/drivers/radeonsi/si_shader_nir.c | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 1001c80dc6..4767b86951 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -6744,7 +6744,7 @@ static void prepare_gs_input_vgprs(struct 
nir_to_llvm_context *ctx)
 }
 
 void ac_nir_translate(struct ac_llvm_context *ac, struct ac_shader_abi *abi,
-                     struct nir_shader *nir, struct nir_to_llvm_context *nctx)
+                     struct nir_shader *nir)
 {
        struct ac_nir_context ctx = {};
        struct nir_function *func;
@@ -6924,7 +6924,7 @@ LLVMModuleRef 
ac_translate_nir_to_llvm(LLVMTargetMachineRef tm,
                nir_foreach_variable(variable, &shaders[i]->outputs)
                        scan_shader_output_decl(&ctx, variable, shaders[i], 
shaders[i]->info.stage);
 
-               ac_nir_translate(&ctx.ac, &ctx.abi, shaders[i], &ctx);
+               ac_nir_translate(&ctx.ac, &ctx.abi, shaders[i]);
 
                if (shader_count >= 2) {
                        LLVMBuildBr(ctx.ac.builder, merge_block);
diff --git a/src/amd/common/ac_nir_to_llvm.h b/src/amd/common/ac_nir_to_llvm.h
index 8c925141a0..07cf9656f5 100644
--- a/src/amd/common/ac_nir_to_llvm.h
+++ b/src/amd/common/ac_nir_to_llvm.h
@@ -232,8 +232,7 @@ void ac_create_gs_copy_shader(LLVMTargetMachineRef tm,
                              const struct ac_nir_compiler_options *options,
                              bool dump_shader);
 
-struct nir_to_llvm_context;
 void ac_nir_translate(struct ac_llvm_context *ac, struct ac_shader_abi *abi,
-                     struct nir_shader *nir, struct nir_to_llvm_context *nctx);
+                     struct nir_shader *nir);
 
 #endif /* AC_NIR_TO_LLVM_H */
diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c 
b/src/gallium/drivers/radeonsi/si_shader_nir.c
index f46e5c6aac..ba4a66fabb 100644
--- a/src/gallium/drivers/radeonsi/si_shader_nir.c
+++ b/src/gallium/drivers/radeonsi/si_shader_nir.c
@@ -861,7 +861,7 @@ bool si_nir_build_llvm(struct si_shader_context *ctx, 
struct nir_shader *nir)
                assert(nir->info.stage == MESA_SHADER_COMPUTE);
                si_declare_compute_memory(ctx);
        }
-       ac_nir_translate(&ctx->ac, &ctx->abi, nir, NULL);
+       ac_nir_translate(&ctx->ac, &ctx->abi, nir);
 
        return true;
 }

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to