From bd1e587ebe053b5a6d3b8cc3597b226d670f4667 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 13 Jun 2006 03:29:02 +0000 Subject: remove some unneeded #includes --- src/mesa/tnl/t_array_import.c | 1 - src/mesa/tnl/t_pipeline.c | 3 --- src/mesa/tnl/t_vb_arbprogram.c | 3 +-- src/mesa/tnl/t_vb_program.c | 3 +-- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/mesa/tnl/t_array_import.c b/src/mesa/tnl/t_array_import.c index 38950d66b8..1b8fe0dd03 100644 --- a/src/mesa/tnl/t_array_import.c +++ b/src/mesa/tnl/t_array_import.c @@ -33,7 +33,6 @@ #include "mtypes.h" #include "array_cache/acache.h" -#include "math/m_translate.h" #include "t_array_import.h" #include "t_context.h" diff --git a/src/mesa/tnl/t_pipeline.c b/src/mesa/tnl/t_pipeline.c index a2d55b2f65..2efe701a80 100644 --- a/src/mesa/tnl/t_pipeline.c +++ b/src/mesa/tnl/t_pipeline.c @@ -32,9 +32,6 @@ #include "state.h" #include "mtypes.h" -#include "math/m_translate.h" -#include "math/m_xform.h" - #include "t_context.h" #include "t_pipeline.h" #include "t_vp_build.h" diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c index 0b39f77ae8..a590875950 100644 --- a/src/mesa/tnl/t_vb_arbprogram.c +++ b/src/mesa/tnl/t_vb_arbprogram.c @@ -38,7 +38,6 @@ #include "light.h" #include "program.h" #include "math/m_matrix.h" -#include "math/m_translate.h" #include "t_context.h" #include "t_pipeline.h" #include "t_vb_arbprogram.h" @@ -1517,7 +1516,7 @@ static void dtr( struct tnl_pipeline_stage *stage ) */ const struct tnl_pipeline_stage _tnl_arb_vertex_program_stage = { - "vertex-program", + "arb-vertex-program", NULL, /* private_data */ init_vertex_program, /* create */ dtr, /* destroy */ diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c index 7a98db85fd..131f5ffa57 100644 --- a/src/mesa/tnl/t_vb_program.c +++ b/src/mesa/tnl/t_vb_program.c @@ -45,8 +45,6 @@ #include "nvvertexec.h" #include "nvprogram.h" -#include "math/m_translate.h" - #include "t_context.h" #include "t_pipeline.h" @@ -231,6 +229,7 @@ static GLboolean init_vp( GLcontext *ctx, return GL_FALSE; /* Allocate arrays of vertex output values */ + /* XXX change '15' to a named constant */ for (i = 0; i < 15; i++) { _mesa_vector4f_alloc( &store->attribs[i], 0, size, 32 ); store->attribs[i].size = 4; -- cgit v1.2.3