diff options
| author | Adam Jackson <ajax@freedesktop.org> | 2004-12-27 20:31:56 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@freedesktop.org> | 2004-12-27 20:31:56 +0000 |
| commit | c3eaa17b37ef83d43a4de211c1b4f616b3bc0a3d (patch) | |
| tree | b1cee126821cce46d6d1b86dbe8a5b9e4c6e27ce /src/mesa/drivers/dri/s3v/s3v_tris.c | |
| parent | 99edafd4e87fdfb53a46d10d497250a9ba1fa91b (diff) | |
Get s3v building with a minimum of warnings.
Diffstat (limited to 'src/mesa/drivers/dri/s3v/s3v_tris.c')
| -rw-r--r-- | src/mesa/drivers/dri/s3v/s3v_tris.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/s3v/s3v_tris.c b/src/mesa/drivers/dri/s3v/s3v_tris.c index 3b52340b4c..d6cceddd45 100644 --- a/src/mesa/drivers/dri/s3v/s3v_tris.c +++ b/src/mesa/drivers/dri/s3v/s3v_tris.c @@ -33,7 +33,7 @@ #define HAVE_BACK_COLORS 0 #define HAVE_HW_FLATSHADE 1 #define VERTEX s3vVertex -#define TAB rast_tab +#define TAB rast_tab #define VERT_SET_RGBA( v, c ) \ do { \ @@ -55,10 +55,10 @@ do { \ static struct { - points_func points; - line_func line; - triangle_func triangle; - quad_func quad; + tnl_points_func points; + tnl_line_func line; + tnl_triangle_func triangle; + tnl_quad_func quad; } rast_tab[S3V_MAX_TRIFUNC]; #define S3V_RAST_CULL_BIT 0x01 @@ -236,7 +236,7 @@ void s3vChooseRasterState(GLcontext *ctx) if ( flags & DD_FLATSHADE ) ind |= S3V_RAST_FLAT_BIT; - if ( ctx->Texture._ReallyEnabled ) { + if ( ctx->Texture.Unit[0]._ReallyEnabled ) { ind |= S3V_RAST_TEX_BIT; } @@ -608,7 +608,7 @@ static void s3vRasterPrimitive( GLcontext *ctx, GLuint hwprim ) { s3vContextPtr vmesa = S3V_CONTEXT(ctx); /* __DRIdrawablePrivate *dPriv = vmesa->driDrawable; */ - CARD32 cmd = vmesa->CMD; + GLuint cmd = vmesa->CMD; unsigned int _hw_prim = hwprim; @@ -650,7 +650,7 @@ static void s3vRenderPrimitive( GLcontext *ctx, GLenum prim ) { s3vContextPtr vmesa = S3V_CONTEXT(ctx); __DRIdrawablePrivate *dPriv = vmesa->driDrawable; - CARD32 cmd = vmesa->CMD; + GLuint cmd = vmesa->CMD; unsigned int _hw_prim = hw_prim[prim]; |