From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Mon, 15 May 2017 09:10:13 +0000 (+0200)
Subject: radeonsi: fix gl_PrimitiveIDIn in geometry shader when using tessellation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f4dbe2efb77be366c52cdd134876a6b00bf324bd;p=mesa.git

radeonsi: fix gl_PrimitiveIDIn in geometry shader when using tessellation

This builds on commit 0549ea15ec38 ("radeonsi: fix primitive ID in
fragment shader when using tessellation").

Fixes piglit
arb_tessellation_shader/execution/gs-primitiveid-instanced.shader_test

Cc: 17.1 <mesa-stable@lists.freedesktop.org>
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 5da60148af2..f761073616a 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -2133,6 +2133,8 @@ static void si_update_tcs_tes_uses_prim_id(struct si_context *sctx)
 		 sctx->tes_shader.cso->info.uses_primid) ||
 		(sctx->tcs_shader.cso &&
 		 sctx->tcs_shader.cso->info.uses_primid) ||
+		(sctx->gs_shader.cso &&
+		 sctx->gs_shader.cso->info.uses_primid) ||
 		(sctx->ps_shader.cso && !sctx->gs_shader.cso &&
 		 sctx->ps_shader.cso->info.uses_primid);
 }