Mesa (master): radeonsi: simplify the signature of si_update_vs_writes_viewport_index

[Nicolai Hähnle]

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

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Tue Sep 26 18:00:21 2017 +0200

radeonsi: simplify the signature of si_update_vs_writes_viewport_index

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/drivers/radeonsi/si_pipe.h           | 3 +--
 src/gallium/drivers/radeonsi/si_state_shaders.c  | 6 +++---
 src/gallium/drivers/radeonsi/si_state_viewport.c | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index e0759eddb2..4fe158fb9a 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -569,8 +569,7 @@ struct pipe_video_buffer *si_video_buffer_create(struct pipe_context *pipe,
 /* si_viewport.c */
 void si_viewport_set_rast_deps(struct si_context *rctx,
 			       bool scissor_enable, bool clip_halfz);
-void si_update_vs_writes_viewport_index(struct si_context *ctx,
-					struct tgsi_shader_info *info);
+void si_update_vs_writes_viewport_index(struct si_context *ctx);
 void si_init_viewport_functions(struct si_context *ctx);
 
 
diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 7619e2f04a..1fadc7ec5d 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -2301,7 +2301,7 @@ static void si_bind_vs_shader(struct pipe_context *ctx, void *state)
 	sctx->vs_shader.current = sel ? sel->first_variant : NULL;
 
 	si_update_common_shader_state(sctx);
-	si_update_vs_writes_viewport_index(sctx, si_get_vs_info(sctx));
+	si_update_vs_writes_viewport_index(sctx);
 	si_set_active_descriptors_for_shader(sctx, sel);
 	si_update_streamout_state(sctx);
 	si_update_clip_regs(sctx, old_hw_vs, old_hw_vs_variant,
@@ -2344,7 +2344,7 @@ static void si_bind_gs_shader(struct pipe_context *ctx, void *state)
 		if (sctx->ia_multi_vgt_param_key.u.uses_tess)
 			si_update_tess_uses_prim_id(sctx);
 	}
-	si_update_vs_writes_viewport_index(sctx, si_get_vs_info(sctx));
+	si_update_vs_writes_viewport_index(sctx);
 	si_set_active_descriptors_for_shader(sctx, sel);
 	si_update_streamout_state(sctx);
 	si_update_clip_regs(sctx, old_hw_vs, old_hw_vs_variant,
@@ -2395,7 +2395,7 @@ static void si_bind_tes_shader(struct pipe_context *ctx, void *state)
 		si_shader_change_notify(sctx);
 		sctx->last_tes_sh_base = -1; /* invalidate derived tess state */
 	}
-	si_update_vs_writes_viewport_index(sctx, si_get_vs_info(sctx));
+	si_update_vs_writes_viewport_index(sctx);
 	si_set_active_descriptors_for_shader(sctx, sel);
 	si_update_streamout_state(sctx);
 	si_update_clip_regs(sctx, old_hw_vs, old_hw_vs_variant,
diff --git a/src/gallium/drivers/radeonsi/si_state_viewport.c b/src/gallium/drivers/radeonsi/si_state_viewport.c
index eb4c00a24d..8e08a61f2f 100644
--- a/src/gallium/drivers/radeonsi/si_state_viewport.c
+++ b/src/gallium/drivers/radeonsi/si_state_viewport.c
@@ -389,9 +389,9 @@ void si_viewport_set_rast_deps(struct si_context *ctx,
  * is delayed. When a shader with VIEWPORT_INDEX appears, this should be
  * called to emit the rest.
  */
-void si_update_vs_writes_viewport_index(struct si_context *ctx,
-					struct tgsi_shader_info *info)
+void si_update_vs_writes_viewport_index(struct si_context *ctx)
 {
+	struct tgsi_shader_info *info = si_get_vs_info(ctx);
 	bool vs_window_space;
 
 	if (!info)