summaryrefslogtreecommitdiff
path: root/src/mesa/swrast/s_texture.h
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-02-23 04:10:54 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-02-23 04:10:54 +0000
commitb8d6607acd3b6d18dab0c7247d5e0fc72e98ceae (patch)
treea146f6d4b57ace61c62b1464fbd059bf8f387870 /src/mesa/swrast/s_texture.h
parent4e44d8c4c68c8a4e68b42f1fb2689d348369da86 (diff)
Move span stuff from swrast.h to s_context.h (it's private).
Implemented remaining fragment program instructions. Initial changes to implement fragment program texture sampling.
Diffstat (limited to 'src/mesa/swrast/s_texture.h')
-rw-r--r--src/mesa/swrast/s_texture.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_texture.h b/src/mesa/swrast/s_texture.h
index 388c2db08d..ddb7b0dde8 100644
--- a/src/mesa/swrast/s_texture.h
+++ b/src/mesa/swrast/s_texture.h
@@ -1,4 +1,4 @@
-/* $Id: s_texture.h,v 1.14 2003/01/26 14:37:17 brianp Exp $ */
+/* $Id: s_texture.h,v 1.15 2003/02/23 04:10:54 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -37,9 +37,8 @@ extern void
_swrast_texture_table_lookup( const struct gl_color_table *table,
GLuint n, GLchan rgba[][4] );
-extern void
+extern texture_sample_func
_swrast_choose_texture_sample_func( GLcontext *ctx,
- GLuint texUnit,
const struct gl_texture_object *tObj );