Mesa (master): radeonsi/nir: add primitive id to inputs scan

[Timothy Arceri]

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

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Fri Jan 19 22:44:58 2018 +1100

radeonsi/nir: add primitive id to inputs scan

Fixes the following piglit tests:

arb_tessellation_shader/fs-primitiveid-instanced
glsl-1.50/primitive-id-no-gs
glsl-1.50/primitive-id-no-gs-first-vertex
glsl-1.50/primitive-id-no-gs-instanced
glsl-1.50/primitive-id-no-gs-strip
glsl-1.50/primitive-id-no-gs-strip-first-vertex

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/gallium/drivers/radeonsi/si_shader_nir.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c
index 56594fcd0e..e26994c06b 100644
--- a/src/gallium/drivers/radeonsi/si_shader_nir.c
+++ b/src/gallium/drivers/radeonsi/si_shader_nir.c
@@ -239,6 +239,9 @@ void si_nir_scan_shader(const struct nir_shader *nir,
 		info->input_semantic_name[i] = semantic_name;
 		info->input_semantic_index[i] = semantic_index;
 
+		if (semantic_name == TGSI_SEMANTIC_PRIMID)
+			info->uses_primid = true;
+
 		if (variable->data.sample)
 			info->input_interpolate_loc[i] = TGSI_INTERPOLATE_LOC_SAMPLE;
 		else if (variable->data.centroid)