From e3caa1cd36a23a73028fb3c70930546b01ad0ac1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 19 Apr 2017 03:15:52 +0200 Subject: [PATCH] radeonsi: simplify some shader type conditions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/radeonsi/si_shader.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 62dc9e2fcee..5ce04d67f38 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -6084,7 +6084,7 @@ static void create_function(struct si_shader_context *ctx) "ddxy_lds", LOCAL_ADDR_SPACE); - if ((ctx->type == PIPE_SHADER_VERTEX && shader->key.as_ls) || + if (shader->key.as_ls || ctx->type == PIPE_SHADER_TESS_CTRL) declare_tess_lds(ctx); } @@ -6101,11 +6101,7 @@ static void preload_ring_buffers(struct si_shader_context *ctx) LLVMValueRef buf_ptr = LLVMGetParam(ctx->main_fn, ctx->param_rw_buffers); - if ((ctx->type == PIPE_SHADER_VERTEX && - ctx->shader->key.as_es) || - (ctx->type == PIPE_SHADER_TESS_EVAL && - ctx->shader->key.as_es) || - ctx->type == PIPE_SHADER_GEOMETRY) { + if (ctx->shader->key.as_es || ctx->type == PIPE_SHADER_GEOMETRY) { unsigned ring = ctx->type == PIPE_SHADER_GEOMETRY ? SI_GS_RING_ESGS : SI_ES_RING_ESGS; -- 2.11.0