diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_cmdbuf.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_context.c | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_draw.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_emit.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_fragprog_common.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_ioctl.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_render.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_state.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_tex.c | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_texstate.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_vertprog.c | 1 | 
11 files changed, 0 insertions, 39 deletions
| diff --git a/src/mesa/drivers/dri/r300/r300_cmdbuf.c b/src/mesa/drivers/dri/r300/r300_cmdbuf.c index ad8db6e68e..96c96d8d9a 100644 --- a/src/mesa/drivers/dri/r300/r300_cmdbuf.c +++ b/src/mesa/drivers/dri/r300/r300_cmdbuf.c @@ -39,19 +39,16 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  #include "main/macros.h"  #include "main/context.h"  #include "main/simple_list.h" -#include "swrast/swrast.h"  #include "drm.h"  #include "radeon_drm.h"  #include "r300_context.h" -#include "r300_ioctl.h"  #include "r300_reg.h"  #include "r300_cmdbuf.h"  #include "r300_emit.h"  #include "radeon_bocs_wrapper.h"  #include "radeon_mipmap_tree.h" -#include "r300_state.h"  #include "radeon_queryobj.h"  /** # of dwords reserved for additional instructions that may need to be written diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c index 5f07b95634..2ad5186384 100644 --- a/src/mesa/drivers/dri/r300/r300_context.c +++ b/src/mesa/drivers/dri/r300/r300_context.c @@ -40,9 +40,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  #include "main/context.h"  #include "main/simple_list.h"  #include "main/imports.h" -#include "main/matrix.h"  #include "main/extensions.h" -#include "main/state.h"  #include "main/bufferobj.h"  #include "main/texobj.h" @@ -52,12 +50,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  #include "tnl/tnl.h"  #include "tnl/t_pipeline.h" -#include "tnl/t_vp_build.h"  #include "drivers/common/driverfuncs.h"  #include "r300_context.h" -#include "radeon_context.h"  #include "radeon_span.h"  #include "r300_cmdbuf.h"  #include "r300_state.h" @@ -69,7 +65,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  #include "radeon_buffer_objects.h"  #include "radeon_queryobj.h" -#include "vblank.h"  #include "utils.h"  #include "xmlpool.h"		/* for symbolic values of enum-type options */ diff --git a/src/mesa/drivers/dri/r300/r300_draw.c b/src/mesa/drivers/dri/r300/r300_draw.c index e9968f9ffe..1d1d41fc5c 100644 --- a/src/mesa/drivers/dri/r300/r300_draw.c +++ b/src/mesa/drivers/dri/r300/r300_draw.c @@ -29,7 +29,6 @@  #include "main/glheader.h"  #include "main/context.h"  #include "main/state.h" -#include "main/api_validate.h"  #include "main/enums.h"  #include "main/simple_list.h" @@ -47,8 +46,6 @@  #include "tnl/tnl.h"  #include "tnl/t_vp_build.h"  #include "vbo/vbo_context.h" -#include "swrast/swrast.h" -#include "swrast_setup/swrast_setup.h"  static int getTypeSize(GLenum type) diff --git a/src/mesa/drivers/dri/r300/r300_emit.c b/src/mesa/drivers/dri/r300/r300_emit.c index 07e6223087..71287514ec 100644 --- a/src/mesa/drivers/dri/r300/r300_emit.c +++ b/src/mesa/drivers/dri/r300/r300_emit.c @@ -39,19 +39,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  #include "main/colormac.h"  #include "main/imports.h"  #include "main/macros.h" -#include "main/image.h"  #include "swrast_setup/swrast_setup.h" -#include "math/m_translate.h"  #include "tnl/tnl.h"  #include "tnl/t_context.h"  #include "r300_context.h" -#include "r300_state.h"  #include "r300_emit.h" -#include "r300_ioctl.h" -#include "r300_render.h" -#include "r300_swtcl.h"  GLuint r300VAPInputCntl0(GLcontext * ctx, GLuint InputsRead)  { diff --git a/src/mesa/drivers/dri/r300/r300_fragprog_common.c b/src/mesa/drivers/dri/r300/r300_fragprog_common.c index 267ee81a7a..d94ed08824 100644 --- a/src/mesa/drivers/dri/r300/r300_fragprog_common.c +++ b/src/mesa/drivers/dri/r300/r300_fragprog_common.c @@ -38,14 +38,12 @@  #include "r300_fragprog_common.h" -#include "shader/program.h"  #include "shader/prog_parameter.h"  #include "shader/prog_print.h"  #include "compiler/radeon_compiler.h"  #include "radeon_mesa_to_rc.h" -#include "r300_state.h"  static GLuint build_dtm(GLuint depthmode) diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c index 5cb04e2bb6..bb34efe827 100644 --- a/src/mesa/drivers/dri/r300/r300_ioctl.c +++ b/src/mesa/drivers/dri/r300/r300_ioctl.c @@ -58,8 +58,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  #include "r300_emit.h"  #include "r300_context.h" -#include "vblank.h" -  #define R200_3D_DRAW_IMMD_2      0xC0003500  #define CLEARBUFFER_COLOR	0x1 diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c index 4ae593cbe7..e3e6285784 100644 --- a/src/mesa/drivers/dri/r300/r300_render.c +++ b/src/mesa/drivers/dri/r300/r300_render.c @@ -53,7 +53,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.  #include "r300_render.h"  #include "main/glheader.h" -#include "main/state.h"  #include "main/imports.h"  #include "main/enums.h"  #include "main/macros.h" @@ -65,15 +64,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.  #include "swrast_setup/swrast_setup.h"  #include "vbo/vbo.h"  #include "vbo/vbo_split.h" -#include "tnl/tnl.h" -#include "tnl/t_vp_build.h"  #include "r300_context.h" -#include "r300_ioctl.h"  #include "r300_state.h"  #include "r300_reg.h" -#include "r300_tex.h"  #include "r300_emit.h" -#include "r300_fragprog_common.h"  #include "r300_swtcl.h"  /** diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index ac20c08e20..66b57e58a7 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -55,17 +55,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  #include "tnl/t_vp_build.h"  #include "r300_context.h" -#include "r300_ioctl.h"  #include "r300_state.h"  #include "r300_reg.h"  #include "r300_emit.h" -#include "r300_tex.h"  #include "r300_fragprog_common.h"  #include "r300_render.h"  #include "r300_vertprog.h" -#include "drirenderbuffer.h" -  static void r300BlendColor(GLcontext * ctx, const GLfloat cf[4])  {  	r300ContextPtr rmesa = R300_CONTEXT(ctx); diff --git a/src/mesa/drivers/dri/r300/r300_tex.c b/src/mesa/drivers/dri/r300/r300_tex.c index 726b3ff98e..de6e6e166a 100644 --- a/src/mesa/drivers/dri/r300/r300_tex.c +++ b/src/mesa/drivers/dri/r300/r300_tex.c @@ -41,19 +41,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  #include "main/mipmap.h"  #include "main/simple_list.h"  #include "main/texstore.h" -#include "main/teximage.h"  #include "main/texobj.h"  #include "texmem.h"  #include "r300_context.h" -#include "r300_state.h" -#include "r300_ioctl.h"  #include "radeon_mipmap_tree.h"  #include "r300_tex.h" -#include "xmlpool.h" -  static unsigned int translate_wrap_mode(GLenum wrapmode)  { diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c index bbe8b1e95f..1dc5f822d9 100644 --- a/src/mesa/drivers/dri/r300/r300_texstate.c +++ b/src/mesa/drivers/dri/r300/r300_texstate.c @@ -45,8 +45,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  #include "main/simple_list.h"  #include "r300_context.h" -#include "r300_state.h" -#include "r300_ioctl.h"  #include "radeon_mipmap_tree.h"  #include "r300_tex.h"  #include "r300_reg.h" diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c index c2f96af2c1..bede6e0418 100644 --- a/src/mesa/drivers/dri/r300/r300_vertprog.c +++ b/src/mesa/drivers/dri/r300/r300_vertprog.c @@ -34,7 +34,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.  #include "shader/program.h"  #include "shader/programopt.h"  #include "shader/prog_instruction.h" -#include "shader/prog_optimize.h"  #include "shader/prog_parameter.h"  #include "shader/prog_print.h"  #include "shader/prog_statevars.h" | 
