ac: remove nir_to_llvm_context from ac_nir_translate()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Samuel Pitoiset
2018-02-12 12:31:59 +01:00
parent a541117ff4
commit 141db61509
3 changed files with 4 additions and 5 deletions
+2 -2
View File
@@ -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);
+1 -2
View File
@@ -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 */
+1 -1
View File
@@ -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;
}