From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Mon, 31 Oct 2016 20:09:20 +0000 (+0100)
Subject: radeonsi: si_shader_vs only depends on the GS selector
X-Git-Tag: upstream/17.1.0~5007
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c6f7d66dc758300e46943ad07da8c3f5d394a03;p=platform%2Fupstream%2Fmesa.git

radeonsi: si_shader_vs only depends on the GS selector

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

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 6971158..ebe7a75 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -524,7 +524,7 @@ static void si_shader_gs(struct si_shader *shader)
  * is the copy shader.
  */
 static void si_shader_vs(struct si_screen *sscreen, struct si_shader *shader,
-                         struct si_shader *gs)
+                         struct si_shader_selector *gs)
 {
 	struct si_pm4_state *pm4;
 	unsigned num_user_sgprs;
@@ -836,7 +836,7 @@ static void si_shader_init_pm4_state(struct si_screen *sscreen,
 		break;
 	case PIPE_SHADER_GEOMETRY:
 		si_shader_gs(shader);
-		si_shader_vs(sscreen, shader->gs_copy_shader, shader);
+		si_shader_vs(sscreen, shader->gs_copy_shader, shader->selector);
 		break;
 	case PIPE_SHADER_FRAGMENT:
 		si_shader_ps(shader);