summaryrefslogtreecommitdiff
path: root/src/mesa/swrast/s_texture.h
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2002-05-02 00:59:20 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2002-05-02 00:59:20 +0000
commitf595212336ae63c981f0f39f4ea1dec67ff7fe25 (patch)
tree9c0762c92e333184234beb5d453462d940da1266 /src/mesa/swrast/s_texture.h
parentc450d57991628318696ee7a2bd052f91f480cda3 (diff)
Implemented GL_ARB_texture_env_crossbar.
Simplification of some of the texture application code.
Diffstat (limited to 'src/mesa/swrast/s_texture.h')
-rw-r--r--src/mesa/swrast/s_texture.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/mesa/swrast/s_texture.h b/src/mesa/swrast/s_texture.h
index 91f147afe0..a920c0fb7c 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.12 2002/04/12 15:39:59 brianp Exp $ */
+/* $Id: s_texture.h,v 1.13 2002/05/02 00:59:20 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -40,12 +40,6 @@ _swrast_choose_texture_sample_func( GLcontext *ctx,
extern void
-_swrast_texture_fragments( GLcontext *ctx, GLuint texUnit,
- struct sw_span *span,
- CONST GLchan primary_rgba[][4]);
-
-
-extern void
-_swrast_multitexture_fragments( GLcontext *ctx, struct sw_span *span );
+_swrast_texture_span( GLcontext *ctx, struct sw_span *span );
#endif