Split the s_texture.c file into two new files:

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

1 files changed, 5 insertions, 4 deletions

diff --git a/src/mesa/swrast/descrip.mms b/src/mesa/swrast/descrip.mms
index 7b356277099..9a89f86a69b 100644
--- a/src/mesa/swrast/descrip.mms
+++ b/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