From: Marek Olšák <marek.olsak@amd.com>
Date: Tue, 5 Sep 2017 15:04:31 +0000 (+0200)
Subject: radeonsi: don't always apply the PrimID instancing bug workaround on SI
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=17dd4856a68621ab7107975df8239fb2963a57bb;p=mesa.git

radeonsi: don't always apply the PrimID instancing bug workaround on SI

It looks like commit 391673af7ad1565a5f6ac8fc2f8c9fcdd1fe9908 that should
have fixed the perf regression didn't really change much if anything.

Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 051dfea8f7c..363a4aed5d5 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -213,7 +213,7 @@ static void si_emit_derived_tess_state(struct si_context *sctx,
 	 * doesn't work correctly on SI when there is no other
 	 * SE to switch to.
 	 */
-	if (has_primid_instancing_bug)
+	if (has_primid_instancing_bug && tess_uses_primid)
 		*num_patches = 1;
 
 	sctx->last_num_patches = *num_patches;