From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Thu, 16 Nov 2017 16:23:43 +0000 (+0100)
Subject: radeonsi/gfx9: simplify condition for on-chip ESGS
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dd078689041077eb9d90888a3cb0166fdc093b93;p=mesa.git

radeonsi/gfx9: simplify condition for on-chip ESGS

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

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index a997ab01039..fc4bab8c9cf 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -4739,9 +4739,7 @@ static void create_function(struct si_shader_context *ctx)
 	if (shader->key.as_ls ||
 	    ctx->type == PIPE_SHADER_TESS_CTRL ||
 	    /* GFX9 has the ESGS ring buffer in LDS. */
-	    (ctx->screen->b.chip_class >= GFX9 &&
-	     (shader->key.as_es ||
-	      ctx->type == PIPE_SHADER_GEOMETRY)))
+	    type == SI_SHADER_MERGED_VERTEX_OR_TESSEVAL_GEOMETRY)
 		ac_declare_lds_as_pointer(&ctx->ac);
 }