From ffe4e829b0da8484ecc98ca4d31bfdbb8d667643 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Mon, 31 Oct 2016 21:13:12 +0100 Subject: [PATCH] radeonsi: remove si_shader_context::is_gs_copy_shader MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It has become redundant. Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/si_shader.c | 11 ++++------- src/gallium/drivers/radeonsi/si_shader_internal.h | 1 - 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 38f65f3b770..fe1542088fb 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -2666,7 +2666,7 @@ static void si_llvm_emit_vs_epilogue(struct lp_build_tgsi_context *bld_base) struct si_shader_output_values *outputs = NULL; int i,j; - assert(!ctx->is_gs_copy_shader); + assert(!ctx->shader->is_gs_copy_shader); outputs = MALLOC((info->num_outputs + 1) * sizeof(outputs[0])); @@ -5312,7 +5312,7 @@ static void create_function(struct si_shader_context *ctx) params[SI_PARAM_LS_OUT_LAYOUT] = ctx->i32; num_params = SI_PARAM_LS_OUT_LAYOUT+1; } else { - if (ctx->is_gs_copy_shader) { + if (shader->is_gs_copy_shader) { num_params = SI_PARAM_RW_BUFFERS+1; } else { params[SI_PARAM_VS_STATE_BITS] = ctx->i32; @@ -5332,7 +5332,7 @@ static void create_function(struct si_shader_context *ctx) params[ctx->param_vs_prim_id = num_params++] = ctx->i32; params[ctx->param_instance_id = num_params++] = ctx->i32; - if (!ctx->is_gs_copy_shader) { + if (!shader->is_gs_copy_shader) { /* Vertex load indices. */ ctx->param_vertex_index0 = num_params; @@ -5340,9 +5340,7 @@ static void create_function(struct si_shader_context *ctx) params[num_params++] = ctx->i32; num_prolog_vgprs += shader->selector->info.num_inputs; - } - if (!ctx->is_gs_copy_shader) { /* PrimitiveID output. */ if (!shader->key.vs.as_es && !shader->key.vs.as_ls) for (i = 0; i <= VS_EPILOG_PRIMID_LOC; i++) @@ -5583,7 +5581,7 @@ static void preload_ring_buffers(struct si_shader_context *ctx) build_indexed_load_const(ctx, buf_ptr, offset); } - if (ctx->is_gs_copy_shader) { + if (ctx->shader->is_gs_copy_shader) { LLVMValueRef offset = lp_build_const_int32(gallivm, SI_VS_RING_GSVS); ctx->gsvs_ring[0] = @@ -6107,7 +6105,6 @@ si_generate_gs_copy_shader(struct si_screen *sscreen, si_init_shader_ctx(&ctx, sscreen, shader, tm); ctx.type = PIPE_SHADER_VERTEX; - ctx.is_gs_copy_shader = true; create_meta_data(&ctx); create_function(&ctx); diff --git a/src/gallium/drivers/radeonsi/si_shader_internal.h b/src/gallium/drivers/radeonsi/si_shader_internal.h index 669813c4b90..55b70e6bf33 100644 --- a/src/gallium/drivers/radeonsi/si_shader_internal.h +++ b/src/gallium/drivers/radeonsi/si_shader_internal.h @@ -52,7 +52,6 @@ struct si_shader_context { struct si_screen *screen; unsigned type; /* PIPE_SHADER_* specifies the type of shader. */ - bool is_gs_copy_shader; /* Whether the prolog will be compiled separately. */ bool separate_prolog; -- 2.30.2