From 5c9b59de8bab451f5f4309f2b2f57680d4f603b2 Mon Sep 17 00:00:00 2001 From: Nicolai Hähnle Date: Mon, 15 May 2017 11:10:13 +0200 Subject: radeonsi: fix gl_PrimitiveIDIn in geometry shader when using tessellation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Marek Olšák (cherry picked from commit f4dbe2efb77be366c52cdd134876a6b00bf324bd) --- src/gallium/drivers/radeonsi/si_state_shaders.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index 0c82deebfc9..f2413907047 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -1820,6 +1820,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); } -- cgit v1.2.3