Reviewed-by: Edward O'Callaghan <funfunc...@folklore1984.net> On 12/08/2016 11:55 AM, Dave Airlie wrote: > From: Dave Airlie <airl...@redhat.com> > > We don't use the nir shader in here at all. > > Signed-off-by: Dave Airlie <airl...@redhat.com> > --- > src/amd/common/ac_nir_to_llvm.c | 15 ++++++--------- > 1 file changed, 6 insertions(+), 9 deletions(-) > > diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c > index bb52e8f..f5f78a3 100644 > --- a/src/amd/common/ac_nir_to_llvm.c > +++ b/src/amd/common/ac_nir_to_llvm.c > @@ -4369,8 +4369,7 @@ si_llvm_init_export_args(struct nir_to_llvm_context > *ctx, > } > > static void > -handle_vs_outputs_post(struct nir_to_llvm_context *ctx, > - struct nir_shader *nir) > +handle_vs_outputs_post(struct nir_to_llvm_context *ctx) > { > uint32_t param_count = 0; > unsigned target; > @@ -4572,8 +4571,7 @@ si_export_mrt_z(struct nir_to_llvm_context *ctx, > } > > static void > -handle_fs_outputs_post(struct nir_to_llvm_context *ctx, > - struct nir_shader *nir) > +handle_fs_outputs_post(struct nir_to_llvm_context *ctx) > { > unsigned index = 0; > LLVMValueRef depth = NULL, stencil = NULL, samplemask = NULL; > @@ -4615,15 +4613,14 @@ handle_fs_outputs_post(struct nir_to_llvm_context > *ctx, > } > > static void > -handle_shader_outputs_post(struct nir_to_llvm_context *ctx, > - struct nir_shader *nir) > +handle_shader_outputs_post(struct nir_to_llvm_context *ctx) > { > switch (ctx->stage) { > case MESA_SHADER_VERTEX: > - handle_vs_outputs_post(ctx, nir); > + handle_vs_outputs_post(ctx); > break; > case MESA_SHADER_FRAGMENT: > - handle_fs_outputs_post(ctx, nir); > + handle_fs_outputs_post(ctx); > break; > default: > break; > @@ -4741,7 +4738,7 @@ LLVMModuleRef > ac_translate_nir_to_llvm(LLVMTargetMachineRef tm, > visit_cf_list(&ctx, &func->impl->body); > phi_post_pass(&ctx); > > - handle_shader_outputs_post(&ctx, nir); > + handle_shader_outputs_post(&ctx); > LLVMBuildRetVoid(ctx.builder); > > ac_llvm_finalize_module(&ctx); >
signature.asc
Description: OpenPGP digital signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev