Mesa (master): radeonsi: don' t call eliminate_const_vs_outputs in shaders without VS exports

Marek Olšák mareko at kemper.freedesktop.org
Thu May 4 22:24:45 UTC 2017


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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Fri Apr 28 16:35:13 2017 +0200

radeonsi: don't call eliminate_const_vs_outputs in shaders without VS exports

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

---

 src/gallium/drivers/radeonsi/si_shader.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 204e641e72..2928fc9039 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -7237,10 +7237,10 @@ static void si_eliminate_const_vs_outputs(struct si_shader_context *ctx)
 	struct si_shader *shader = ctx->shader;
 	struct tgsi_shader_info *info = &shader->selector->info;
 
-	if (ctx->type == PIPE_SHADER_FRAGMENT ||
-	    ctx->type == PIPE_SHADER_COMPUTE ||
-	    shader->key.as_es ||
-	    shader->key.as_ls)
+	if ((ctx->type != PIPE_SHADER_VERTEX &&
+	     ctx->type != PIPE_SHADER_TESS_EVAL) ||
+	    shader->key.as_ls ||
+	    shader->key.as_es)
 		return;
 
 	ac_optimize_vs_outputs(&ctx->ac,




More information about the mesa-commit mailing list