Mesa (master): radv/ac: no need to pass nir to the post outputs handling

Dave Airlie airlied at kemper.freedesktop.org
Thu Dec 8 23:11:15 UTC 2016


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

Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Dec  8 00:54:24 2016 +0000

radv/ac: no need to pass nir to the post outputs handling

We don't use the nir shader in here at all.

Reviewed by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Reviewed-by: Edward O'Callaghan <funfunctor at folklore1984.net>
Signed-off-by: Dave Airlie <airlied at 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 c2a74d4..d5dfbb1 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -4352,8 +4352,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;
@@ -4555,8 +4554,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;
@@ -4598,15 +4596,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;
@@ -4724,7 +4721,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);




More information about the mesa-commit mailing list