Split the s_texture.c file into two new files:

s_texcombine.c - for texture combining/application
  s_texfilter.c - for texture sampling/filtering

src/mesa/sources

@@ -103,7 +103,8 @@ SWRAST_SOURCES = \
 	swrast/s_span.c \
 	swrast/s_stencil.c \
 	swrast/s_tcc.c \
-	swrast/s_texture.c \
+	swrast/s_texcombine.c \
+	swrast/s_texfilter.c \
 	swrast/s_texstore.c \
 	swrast/s_triangle.c \
 	swrast/s_zoom.c

src/mesa/swrast/descrip.mms

@@ -22,8 +22,8 @@ SOURCES = s_aaline.c s_aatriangle.c s_accum.c s_alpha.c \
 	s_bitmap.c s_blend.c s_buffers.c s_context.c s_copypix.c s_depth.c \
         s_drawpix.c s_feedback.c s_fog.c s_imaging.c s_lines.c s_logic.c \
 	s_masking.c s_nvfragprog.c s_pixeltex.c s_points.c s_readpix.c \
-	s_span.c s_stencil.c s_texstore.c s_texture.c s_triangle.c s_zoom.c \
-	s_atifragshader.c
+	s_span.c s_stencil.c s_texstore.c s_texcombine.c s_texfilter.c \
+	s_triangle.c s_zoom.c s_atifragshader.c
  
 OBJECTS = s_aaline.obj,s_aatriangle.obj,s_accum.obj,s_alpha.obj,\
 	s_bitmap.obj,s_blend.obj,\
@@ -31,7 +31,7 @@ OBJECTS = s_aaline.obj,s_aatriangle.obj,s_accum.obj,s_alpha.obj,\
 	s_copypix.obj,s_depth.obj,s_drawpix.obj,s_feedback.obj,s_fog.obj,\
 	s_imaging.obj,s_lines.obj,s_logic.obj,s_masking.obj,s_nvfragprog.obj,\
 	s_pixeltex.obj,s_points.obj,s_readpix.obj,s_span.obj,s_stencil.obj,\
-	s_texstore.obj,s_texture.obj,s_triangle.obj,s_zoom.obj
+	s_texstore.obj,s_texcombine.obj,s_texfilter.obj,s_triangle.obj,s_zoom.obj
  
 ##### RULES #####
 
@@ -71,6 +71,7 @@ s_readpix.obj : s_readpix.c
 s_span.obj : s_span.c
 s_stencil.obj : s_stencil.c
 s_texstore.obj : s_texstore.c
-s_texture.obj : s_texture.c
+s_texcombine.obj : s_texcombine.c
+s_texfilter.obj : s_texfilter.c
 s_triangle.obj : s_triangle.c
 s_zoom.obj : s_zoom.c

src/mesa/swrast/s_texcombine.h

@@ -0,0 +1,36 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.5
+ *
+ * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_TEXCOMBINE_H
+#define S_TEXCOMBINE_H
+
+
+#include "mtypes.h"
+#include "swrast.h"
+
+extern void
+_swrast_texture_span( GLcontext *ctx, struct sw_span *span );
+
+#endif

src/mesa/swrast/s_texfilter.h

@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
+ * Version:  6.5
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef S_TEXTURE_H
-#define S_TEXTURE_H
+#ifndef S_TEXFILTER_H
+#define S_TEXFILTER_H
 
 
 #include "mtypes.h"
@@ -36,7 +36,4 @@ _swrast_choose_texture_sample_func( GLcontext *ctx,
 				    const struct gl_texture_object *tObj );
 
 
-extern void
-_swrast_texture_span( GLcontext *ctx, struct sw_span *span );
-
 #endif