From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Fri, 28 Oct 2016 20:08:10 +0000 (+0200)
Subject: radeonsi: get rid of select_interp_param
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3f4439b6bab14016b40dd08cf2dc2585645cd076;p=mesa.git

radeonsi: get rid of select_interp_param

The condition !ctx->no_prolog is now always true.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index b7678e1c36a..8bd8c8077db 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);
 	}