Module: Mesa Branch: master Commit: b177162489ead95e042624e6920e7abe91e98561 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b177162489ead95e042624e6920e7abe91e98561
Author: Marek Olšák <[email protected]> Date: Sun Jan 22 13:58:05 2017 +0100 radeonsi: remove si_shader_context::param_tess_offchip we don't use on-chip tess. Reviewed-by: Nicolai Hähnle <[email protected]> --- src/gallium/drivers/radeonsi/si_shader.c | 6 +++--- src/gallium/drivers/radeonsi/si_shader_internal.h | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index cad7bf7..5c5f2e6 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -5540,7 +5540,7 @@ static void declare_streamout_params(struct si_shader_context *ctx, if (ctx->type != PIPE_SHADER_TESS_EVAL) params[ctx->param_streamout_config = (*num_params)++] = i32; else - ctx->param_streamout_config = ctx->param_tess_offchip; + ctx->param_streamout_config = *num_params - 1; params[ctx->param_streamout_write_index = (*num_params)++] = i32; } @@ -5704,10 +5704,10 @@ static void create_function(struct si_shader_context *ctx) if (shader->key.as_es) { params[ctx->param_oc_lds = num_params++] = ctx->i32; - params[ctx->param_tess_offchip = num_params++] = ctx->i32; + params[num_params++] = ctx->i32; params[ctx->param_es2gs_offset = num_params++] = ctx->i32; } else { - params[ctx->param_tess_offchip = num_params++] = ctx->i32; + params[num_params++] = ctx->i32; declare_streamout_params(ctx, &shader->selector->so, params, ctx->i32, &num_params); params[ctx->param_oc_lds = num_params++] = ctx->i32; diff --git a/src/gallium/drivers/radeonsi/si_shader_internal.h b/src/gallium/drivers/radeonsi/si_shader_internal.h index d37a9e7..9055b4d 100644 --- a/src/gallium/drivers/radeonsi/si_shader_internal.h +++ b/src/gallium/drivers/radeonsi/si_shader_internal.h @@ -121,11 +121,6 @@ struct si_shader_context { int param_es2gs_offset; int param_oc_lds; - /* Sets a bit if the dynamic HS control word was 0x80000000. The bit is - * 0x800000 for VS, 0x1 for ES. - */ - int param_tess_offchip; - LLVMTargetMachineRef tm; unsigned invariant_load_md_kind; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
