From 3f4439b6bab14016b40dd08cf2dc2585645cd076 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Fri, 28 Oct 2016 22:08:10 +0200 Subject: [PATCH] radeonsi: get rid of select_interp_param MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The condition !ctx->no_prolog is now always true. Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/si_shader.c | 41 -------------------------------- 1 file changed, 41 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index b7678e1..8bd8c80 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -1183,45 +1183,6 @@ static int lookup_interp_param_index(unsigned interpolate, unsigned location) } } -/* This shouldn't be used by explicit INTERP opcodes. */ -static unsigned select_interp_param(struct si_shader_context *ctx, - unsigned param) -{ - if (!ctx->no_prolog) - return param; - - if (ctx->shader->key.ps.prolog.force_persp_sample_interp) { - switch (param) { - case SI_PARAM_PERSP_CENTROID: - case SI_PARAM_PERSP_CENTER: - return SI_PARAM_PERSP_SAMPLE; - } - } - if (ctx->shader->key.ps.prolog.force_linear_sample_interp) { - switch (param) { - case SI_PARAM_LINEAR_CENTROID: - case SI_PARAM_LINEAR_CENTER: - return SI_PARAM_LINEAR_SAMPLE; - } - } - if (ctx->shader->key.ps.prolog.force_persp_center_interp) { - switch (param) { - case SI_PARAM_PERSP_CENTROID: - case SI_PARAM_PERSP_SAMPLE: - return SI_PARAM_PERSP_CENTER; - } - } - if (ctx->shader->key.ps.prolog.force_linear_center_interp) { - switch (param) { - case SI_PARAM_LINEAR_CENTROID: - case SI_PARAM_LINEAR_SAMPLE: - return SI_PARAM_LINEAR_CENTER; - } - } - - return param; -} - /** * Interpolate a fragment shader input. * @@ -1424,8 +1385,6 @@ static void declare_input_fs( if (interp_param_idx == -1) return; else if (interp_param_idx) { - interp_param_idx = select_interp_param(ctx, - interp_param_idx); interp_param = get_interp_param(ctx, interp_param_idx); } -- 2.7.4