diff options
| -rw-r--r-- | src/mesa/swrast/s_atifragshader.c | 2 | ||||
| -rw-r--r-- | src/mesa/swrast/s_context.c | 2 | ||||
| -rw-r--r-- | src/mesa/swrast/s_copypix.c | 1 | ||||
| -rw-r--r-- | src/mesa/swrast/s_fragprog_to_c.c | 1 | ||||
| -rw-r--r-- | src/mesa/swrast/s_nvfragprog.c | 2 | ||||
| -rw-r--r-- | src/mesa/swrast/s_pixeltex.c | 1 | ||||
| -rw-r--r-- | src/mesa/swrast/s_span.c | 2 | ||||
| -rw-r--r-- | src/mesa/swrast/s_tcc.c | 1 |
8 files changed, 3 insertions, 9 deletions
diff --git a/src/mesa/swrast/s_atifragshader.c b/src/mesa/swrast/s_atifragshader.c index 4b53ff6587e..292f00e9465 100644 --- 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 0808876dab9..bdd11727095 100644 --- 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 d3c919c571d..75d2defa217 100644 --- 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 1953e8c73cc..e94c4c78a6a 100644 --- 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 8a2c4464ac0..5ec1ce078fe 100644 --- 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 1c65290d40d..b4c919bf56c 100644 --- 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 a44a91036c5..d01973df726 100644 --- 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 550a2aabdb3..2309275b957 100644 --- 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 |