[Piglit] [PATCH 01/12] swrast: make _mesa_get_texel_fetch_func() static

Brian Paul brian.e.paul at gmail.com
Sat Dec 8 16:13:03 PST 2012


From: Brian Paul <brianp at vmware.com>

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 86b01a0..9117885 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 33950ce..4e4397e 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);
 
-- 
1.7.4.1



More information about the Piglit mailing list