Update includes post-splitting of s_texture.c

diff --git a/src/mesa/swrast/s_atifragshader.c b/src/mesa/swrast/s_atifragshader.c
index 4b53ff6587e6d344f403fd9bd3a5c18487e875cc..292f00e9465e096b3719620134c0951f4cc3f9c8 100644 (file)
--- a/src/mesa/swrast/s_atifragshader.c
+++ b/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.

diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 0808876dab953dc562efcccbc87501b378cb2a2d..bdd11727095744783fa21a1cfb8db6e310ffdfbd 100644 (file)
--- a/src/mesa/swrast/s_context.c
+++ b/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"
 
 
 /**

diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index d3c919c571de4a5909d6f5ebf06ded9ea6883119..75d2defa217caa40b8c95a613a27152b69311300 100644 (file)
--- a/src/mesa/swrast/s_copypix.c
+++ b/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"
 
 

diff --git a/src/mesa/swrast/s_fragprog_to_c.c b/src/mesa/swrast/s_fragprog_to_c.c
index 1953e8c73cc792e8cdc904fabcbd77113e0a9751..e94c4c78a6a4f2fbb5bfa69b2ddb978639b5f892 100644 (file)
--- a/src/mesa/swrast/s_fragprog_to_c.c
+++ b/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

diff --git a/src/mesa/swrast/s_nvfragprog.c b/src/mesa/swrast/s_nvfragprog.c
index 8a2c4464ac0108da5cf187f1ad9fd4902be4c369..5ec1ce078fecfe2f6bc18564f94c38b3ed70c67a 100644 (file)
--- a/src/mesa/swrast/s_nvfragprog.c
+++ b/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 */

diff --git a/src/mesa/swrast/s_pixeltex.c b/src/mesa/swrast/s_pixeltex.c
index 1c65290d40d687ab4d98902593c9f692bbdee5c9..b4c919bf56c2d765e57a507fe6a3acf5d7286232 100644 (file)
--- a/src/mesa/swrast/s_pixeltex.c
+++ b/src/mesa/swrast/s_pixeltex.c
@@ -37,7 +37,6 @@
 
 #include "s_context.h"
 #include "s_pixeltex.h"
-#include "s_texture.h"
 
 
 /*

diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index a44a91036c51295a157bae7a54f70aa0ae29e70d..d01973df726db87b14500ce888cb55704bdc58f2 100644 (file)
--- a/src/mesa/swrast/s_span.c
+++ b/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"
 
 
 /**

diff --git a/src/mesa/swrast/s_tcc.c b/src/mesa/swrast/s_tcc.c
index 550a2aabdb33bd6eb763a4cb80e66c2f3ef8f2f1..2309275b9575848b64ea2748db8b2b33fed2b7f0 100644 (file)
--- a/src/mesa/swrast/s_tcc.c
+++ b/src/mesa/swrast/s_tcc.c
@@ -41,7 +41,6 @@
 #include "program.h"
 
 #include "s_nvfragprog.h"
-#include "s_texture.h"
 
 #ifdef USE_TCC