KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build fixes

This commit is contained in:
Alan Hourihane 2004-04-08 08:54:23 +00:00
parent caa5f7e75e
commit b303217c14
10 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mesa/drivers/dri/ffb/ffb_tris.h
View File

@ -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) */

2
src/mesa/drivers/dri/ffb/ffb_xmesa.c
View File

@ -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,

2
src/mesa/drivers/dri/gamma/gamma_state.c
View File

@ -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

1
src/mesa/drivers/dri/i810/i810tex.c
View File

@ -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"

1
src/mesa/drivers/dri/i830/i830_tex.c
View File

@ -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"

1
src/mesa/drivers/dri/mga/mgapixel.c
View File

@ -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"

1
src/mesa/drivers/dri/r128/r128_tex.c
View File

@ -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"

2
src/mesa/drivers/dri/radeon/radeon_maos_verts.c
View File

@ -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"

2
src/mesa/drivers/dri/radeon/radeon_tcl.c
View File

@ -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
*/

3
src/mesa/drivers/dri/tdfx/tdfx_texstate.c
View File

@ -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