gallium: Inline away util_make_fragment_tex_shader interp_mode

Everything sets it to linear.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17918>

diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c
index 0daa5b7..a1d8a97 100644 (file)
--- a/src/gallium/auxiliary/util/u_blitter.c
+++ b/src/gallium/auxiliary/util/u_blitter.c
@@ -1068,7 +1068,6 @@ static void *blitter_get_fs_texfetch_col(struct blitter_context_priv *ctx,
       if (!*shader) {
          assert(!ctx->cached_all_shaders);
          *shader = util_make_fragment_tex_shader(pipe, tgsi_tex,
-                                                 TGSI_INTERPOLATE_LINEAR,
                                                  stype, dtype,
                                                  ctx->has_tex_lz, use_txf);
       }

diff --git a/src/gallium/auxiliary/util/u_simple_shaders.c b/src/gallium/auxiliary/util/u_simple_shaders.c
index 61df3ab..f367887 100644 (file)
--- a/src/gallium/auxiliary/util/u_simple_shaders.c
+++ b/src/gallium/auxiliary/util/u_simple_shaders.c
@@ -289,12 +289,10 @@ util_make_fragment_tex_shader_xrbias(struct pipe_context *pipe,
  *  END;
  *
  * \param tex_target  one of TGSI_TEXTURE_x
- * \parma interp_mode  either TGSI_INTERPOLATE_LINEAR or PERSPECTIVE
  */
 void *
 util_make_fragment_tex_shader(struct pipe_context *pipe,
                               enum tgsi_texture_type tex_target,
-                              enum tgsi_interpolate_mode interp_mode,
                               enum tgsi_return_type stype,
                               enum tgsi_return_type dtype,
                               bool load_level_zero,
@@ -307,8 +305,6 @@ util_make_fragment_tex_shader(struct pipe_context *pipe,
    struct ureg_dst out;
 
    assert((stype == TGSI_RETURN_TYPE_FLOAT) == (dtype == TGSI_RETURN_TYPE_FLOAT));
-   assert(interp_mode == TGSI_INTERPOLATE_LINEAR ||
-          interp_mode == TGSI_INTERPOLATE_PERSPECTIVE);
 
    ureg = ureg_create( PIPE_SHADER_FRAGMENT );
    if (!ureg)
@@ -320,7 +316,7 @@ util_make_fragment_tex_shader(struct pipe_context *pipe,
 
    tex = ureg_DECL_fs_input( ureg, 
                              TGSI_SEMANTIC_GENERIC, 0, 
-                             interp_mode );
+                             TGSI_INTERPOLATE_LINEAR );
 
    out = ureg_DECL_output( ureg, 
                            TGSI_SEMANTIC_COLOR,

diff --git a/src/gallium/auxiliary/util/u_simple_shaders.h b/src/gallium/auxiliary/util/u_simple_shaders.h
index e547241..b52ef24 100644 (file)
--- a/src/gallium/auxiliary/util/u_simple_shaders.h
+++ b/src/gallium/auxiliary/util/u_simple_shaders.h
@@ -75,7 +75,6 @@ util_make_fragment_tex_shader_xrbias(struct pipe_context *pipe,
 extern void *
 util_make_fragment_tex_shader(struct pipe_context *pipe,
                               enum tgsi_texture_type tex_target,
-                              enum tgsi_interpolate_mode interp_mode,
                               enum tgsi_return_type stype,
                               enum tgsi_return_type dtype,
                               bool load_level_zero,

diff --git a/src/gallium/auxiliary/util/u_tests.c b/src/gallium/auxiliary/util/u_tests.c
index eb58c05..aab3ca5 100644 (file)
--- a/src/gallium/auxiliary/util/u_tests.c
+++ b/src/gallium/auxiliary/util/u_tests.c
@@ -396,7 +396,6 @@ null_sampler_view(struct pipe_context *ctx, unsigned tgsi_tex_target)
 
    /* Fragment shader. */
    fs = util_make_fragment_tex_shader(ctx, tgsi_tex_target,
-                                      TGSI_INTERPOLATE_LINEAR,
                                       TGSI_RETURN_TYPE_FLOAT,
                                       TGSI_RETURN_TYPE_FLOAT, false, false);
    cso_set_fragment_shader_handle(cso, fs);

diff --git a/src/gallium/tests/trivial/quad-tex.c b/src/gallium/tests/trivial/quad-tex.c
index 2578fb5..5e69537 100644 (file)
--- a/src/gallium/tests/trivial/quad-tex.c
+++ b/src/gallium/tests/trivial/quad-tex.c
@@ -281,7 +281,6 @@ static void init_prog(struct program *p)
 
        /* fragment shader */
        p->fs = util_make_fragment_tex_shader(p->pipe, TGSI_TEXTURE_2D,
-                                             TGSI_INTERPOLATE_LINEAR,
                                              TGSI_RETURN_TYPE_FLOAT,
                                              TGSI_RETURN_TYPE_FLOAT, false,
                                               false);