Update includes post-splitting of s_texture.c

src/mesa/swrast/s_atifragshader.c

@@ -30,7 +30,7 @@
 #include "s_atifragshader.h"
 #include "s_nvfragprog.h"
 #include "s_span.h"
-#include "s_texture.h"
+
 
 /**
  * Fetch a texel.

src/mesa/swrast/s_context.c

@@ -42,7 +42,7 @@
 #include "s_points.h"
 #include "s_span.h"
 #include "s_triangle.h"
-#include "s_texture.h"
+#include "s_texfilter.h"
 
 
 /**

src/mesa/swrast/s_copypix.c

@@ -38,7 +38,6 @@
 #include "s_pixeltex.h"
 #include "s_span.h"
 #include "s_stencil.h"
-#include "s_texture.h"
 #include "s_zoom.h"
 
 

src/mesa/swrast/s_fragprog_to_c.c

@@ -36,7 +36,6 @@
 
 #include "s_nvfragprog.h"
 #include "s_span.h"
-#include "s_texture.h"
 
 
 #ifdef USE_TCC

src/mesa/swrast/s_nvfragprog.c

@@ -35,12 +35,10 @@
 #include "colormac.h"
 #include "context.h"
 #include "nvfragprog.h"
-#include "macros.h"
 #include "program.h"
 
 #include "s_nvfragprog.h"
 #include "s_span.h"
-#include "s_texture.h"
 
 
 /* if 1, print some debugging info */

src/mesa/swrast/s_pixeltex.c

@@ -37,7 +37,6 @@
 
 #include "s_context.h"
 #include "s_pixeltex.h"
-#include "s_texture.h"
 
 
 /*

src/mesa/swrast/s_span.c

@@ -47,7 +47,7 @@
 #include "s_nvfragprog.h"
 #include "s_span.h"
 #include "s_stencil.h"
-#include "s_texture.h"
+#include "s_texcombine.h"
 
 
 /**

src/mesa/swrast/s_tcc.c

@@ -41,7 +41,6 @@
 #include "program.h"
 
 #include "s_nvfragprog.h"
-#include "s_texture.h"
 
 #ifdef USE_TCC