From f4896cea0435905eb4871c78e32da6984e4d344c Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 8 Dec 2012 15:19:44 -0700 Subject: [PATCH] swrast: make _mesa_get_texel_fetch_func() static Not called from any other file. --- src/mesa/swrast/s_texfetch.c | 8 ++++---- src/mesa/swrast/s_texfetch.h | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c index 86b01a0b346..9117885e791 100644 --- a/src/mesa/swrast/s_texfetch.c +++ b/src/mesa/swrast/s_texfetch.c @@ -1175,8 +1175,8 @@ texfetch_funcs[] = }; -FetchTexelFunc -_mesa_get_texel_fetch_func(gl_format format, GLuint dims) +static FetchTexelFunc +get_texel_fetch_func(gl_format format, GLuint dims) { #ifdef DEBUG /* check that the table entries are sorted by format name */ @@ -1198,7 +1198,7 @@ _mesa_get_texel_fetch_func(gl_format format, GLuint dims) case 3: return texfetch_funcs[format].Fetch3D; default: - assert(0 && "bad dims in _mesa_get_texel_fetch_func"); + assert(0 && "bad dims in get_texel_fetch_func"); return NULL; } } @@ -1220,7 +1220,7 @@ set_fetch_functions(struct gl_sampler_object *samp, format = _mesa_get_srgb_format_linear(format); } - texImage->FetchTexel = _mesa_get_texel_fetch_func(format, dims); + texImage->FetchTexel = get_texel_fetch_func(format, dims); ASSERT(texImage->FetchTexel); } diff --git a/src/mesa/swrast/s_texfetch.h b/src/mesa/swrast/s_texfetch.h index 33950ce440c..4e4397e13af 100644 --- a/src/mesa/swrast/s_texfetch.h +++ b/src/mesa/swrast/s_texfetch.h @@ -29,9 +29,6 @@ #include "swrast/s_context.h" -extern FetchTexelFunc -_mesa_get_texel_fetch_func(gl_format format, GLuint dims); - void _mesa_update_fetch_functions(struct gl_context *ctx, GLuint unit); -- 2.30.2