build fixes

diff --git a/src/mesa/drivers/dri/ffb/ffb_tris.h b/src/mesa/drivers/dri/ffb/ffb_tris.h
index 1b1a007..a803174 100644 (file)
--- a/src/mesa/drivers/dri/ffb/ffb_tris.h
+++ b/src/mesa/drivers/dri/ffb/ffb_tris.h
@@ -23,7 +23,4 @@ extern void ffbChooseTriangleState(GLcontext *ctx);
 extern void ffbFallback( GLcontext *ctx, GLuint bit, GLboolean mode );
 #define FALLBACK( ctx, bit, mode ) ffbFallback( ctx, bit, mode )
 
-extern void ffb_fallback_line(GLcontext *, ffb_vertex *, ffb_vertex *);
-extern void ffb_fallback_point(GLcontext *, ffb_vertex *);
-
 #endif /* !(_FFB_TRIS_H) */

diff --git a/src/mesa/drivers/dri/ffb/ffb_xmesa.c b/src/mesa/drivers/dri/ffb/ffb_xmesa.c
index 0d7a2fd..ae31bfe 100644 (file)
--- a/src/mesa/drivers/dri/ffb/ffb_xmesa.c
+++ b/src/mesa/drivers/dri/ffb/ffb_xmesa.c
@@ -156,7 +156,7 @@ ffbDestroyScreen(__DRIscreenPrivate *sPriv)
        Xfree(ffbScreen);
 }
 
-static const struct gl_pipeline_stage *ffb_pipeline[] = {
+static const struct tnl_pipeline_stage *ffb_pipeline[] = {
    &_tnl_vertex_transform_stage, 
    &_tnl_normal_transform_stage, 
    &_tnl_lighting_stage,

diff --git a/src/mesa/drivers/dri/gamma/gamma_state.c b/src/mesa/drivers/dri/gamma/gamma_state.c
index 4a3beef..7beabc6 100644 (file)
--- a/src/mesa/drivers/dri/gamma/gamma_state.c
+++ b/src/mesa/drivers/dri/gamma/gamma_state.c
@@ -582,6 +582,7 @@ static void gammaUpdateFogAttrib( GLcontext *ctx )
    }
 }
 
+#if 0
 static void gammaDDFogfv( GLcontext *ctx, GLenum pname, const GLfloat *param )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
@@ -589,6 +590,7 @@ static void gammaDDFogfv( GLcontext *ctx, GLenum pname, const GLfloat *param )
    FLUSH_BATCH( gmesa );
    gmesa->new_state |= GAMMA_NEW_FOG;
 }
+#endif
 
 /* =============================================================
  * Lines

diff --git a/src/mesa/drivers/dri/i810/i810tex.c b/src/mesa/drivers/dri/i810/i810tex.c
index dbcaae5..72919ca 100644 (file)
--- a/src/mesa/drivers/dri/i810/i810tex.c
+++ b/src/mesa/drivers/dri/i810/i810tex.c
@@ -32,6 +32,7 @@
 #include "texformat.h"
 #include "teximage.h"
 #include "texmem.h"
+#include "texobj.h"
 #include "swrast/swrast.h"
 #include "colormac.h"
 #include "texobj.h"

diff --git a/src/mesa/drivers/dri/i830/i830_tex.c b/src/mesa/drivers/dri/i830/i830_tex.c
index 9e5e22e..d4a7024 100644 (file)
--- a/src/mesa/drivers/dri/i830/i830_tex.c
+++ b/src/mesa/drivers/dri/i830/i830_tex.c
@@ -44,6 +44,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "teximage.h"
 #include "texformat.h"
 #include "texmem.h"
+#include "texobj.h"
 #include "swrast/swrast.h"
 #include "texobj.h"
 #include "mm.h"

diff --git a/src/mesa/drivers/dri/mga/mgapixel.c b/src/mesa/drivers/dri/mga/mgapixel.c
index df6489c..f380de7 100644 (file)
--- a/src/mesa/drivers/dri/mga/mgapixel.c
+++ b/src/mesa/drivers/dri/mga/mgapixel.c
@@ -27,7 +27,6 @@
  */
 /* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgapixel.c,v 1.9 2002/11/05 17:46:08 tsi Exp $ */
 
-#include "enums.h"
 #include "mtypes.h"
 #include "macros.h"
 #include "texutil.h"

diff --git a/src/mesa/drivers/dri/r128/r128_tex.c b/src/mesa/drivers/dri/r128/r128_tex.c
index 62933b0..973048b 100644 (file)
--- a/src/mesa/drivers/dri/r128/r128_tex.c
+++ b/src/mesa/drivers/dri/r128/r128_tex.c
@@ -48,6 +48,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "texstore.h"
 #include "texformat.h"
 #include "teximage.h"
+#include "texobj.h"
 #include "imports.h"
 #include "colormac.h"
 #include "texobj.h"

diff --git a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c
index cb381ef..8cb08a8 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c
+++ b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c
@@ -41,7 +41,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "math/m_translate.h"
 #include "tnl/tnl.h"
 #include "tnl/t_pipeline.h"
-
+#include "math/m_translate.h"
 #include "radeon_context.h"
 #include "radeon_state.h"
 #include "radeon_ioctl.h"

diff --git a/src/mesa/drivers/dri/radeon/radeon_tcl.c b/src/mesa/drivers/dri/radeon/radeon_tcl.c
index ffa09d1..9aec22b 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_tcl.c
+++ b/src/mesa/drivers/dri/radeon/radeon_tcl.c
@@ -282,7 +282,7 @@ static GLboolean radeon_run_tcl_render( GLcontext *ctx,
    radeonContextPtr rmesa = RADEON_CONTEXT(ctx);
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    struct vertex_buffer *VB = &tnl->vb;
-   GLuint i,flags = 0,length;
+   GLuint i;
 
    /* TODO: separate this from the swtnl pipeline 
     */

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_texstate.c b/src/mesa/drivers/dri/tdfx/tdfx_texstate.c
index c9caea3..3de73c4 100644 (file)
--- a/src/mesa/drivers/dri/tdfx/tdfx_texstate.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_texstate.c
@@ -1478,6 +1478,7 @@ selectSingleTMUSrc(tdfxContextPtr fxMesa, GLint tmu, FxBool LODblend)
    fxMesa->dirty |= TDFX_UPLOAD_TEXTURE_ENV;
 }
 
+#if 0
 static void print_state(tdfxContextPtr fxMesa)
 {
    GLcontext *ctx = fxMesa->glCtx;
@@ -1499,7 +1500,7 @@ static void print_state(tdfxContextPtr fxMesa)
           fxMesa->TexState.EnvMode[1]);
    printf("   BaseFmt: GL=0x%x  Gr:0x%x\n", base1, fxMesa->TexState.TexFormat[1]);
 }
-
+#endif
 
 /*
  * When we're only using a single texture unit, we always use the 0th