diff options
| author | Brian Paul <[email protected]> | 2010-01-25 14:46:17 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-01-25 14:46:17 -0700 |
| commit | 9b22427911ad27efc1f36faee9462c6082d0417c (patch) | |
| tree | 12e5a6c336e4ca2a71b754120dfcc183f09ae58c /src/mesa/drivers/dri/tdfx/tdfx_state.c | |
| parent | 7e7f8815fbfa21ab2397e673fa19c36603bc7a51 (diff) | |
| parent | 6749310d3f60df70ad8f82db986871ab9496793b (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/drivers/dri/intel/intel_screen.c
src/mesa/drivers/dri/intel/intel_swapbuffers.c
src/mesa/drivers/dri/r300/r300_emit.c
src/mesa/drivers/dri/r300/r300_ioctl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texstate.c
Diffstat (limited to 'src/mesa/drivers/dri/tdfx/tdfx_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/tdfx/tdfx_state.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_state.c b/src/mesa/drivers/dri/tdfx/tdfx_state.c index cdb61a0ce05..dcbc7647f29 100644 --- a/src/mesa/drivers/dri/tdfx/tdfx_state.c +++ b/src/mesa/drivers/dri/tdfx/tdfx_state.c @@ -40,8 +40,6 @@ #include "main/mtypes.h" #include "main/colormac.h" -#include "main/texstore.h" -#include "main/teximage.h" #include "swrast/swrast.h" #include "vbo/vbo.h" @@ -51,11 +49,9 @@ #include "tdfx_context.h" #include "tdfx_state.h" -#include "tdfx_vb.h" #include "tdfx_tex.h" #include "tdfx_texman.h" #include "tdfx_texstate.h" -#include "tdfx_tris.h" #include "tdfx_render.h" |