diff options
| author | Samuel Pitoiset <[email protected]> | 2018-02-12 12:31:59 +0100 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2018-02-14 11:53:14 +0100 |
| commit | 141db615093c495e2c0357d4941d515c4f5a337b (patch) | |
| tree | 15378c0937419a8aec21da7fca9c002af5837a84 /src | |
| parent | a541117ff4185b4c742e2d401bb4edd2c0c8031f (diff) | |
ac: remove nir_to_llvm_context from ac_nir_translate()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/amd/common/ac_nir_to_llvm.c | 4 | ||||
| -rw-r--r-- | src/amd/common/ac_nir_to_llvm.h | 3 | ||||
| -rw-r--r-- | 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 1001c80dc6c..4767b869510 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 8c925141a09..07cf9656f59 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 f46e5c6aac4..ba4a66fabbc 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; } |