diff options
| author | Keith Whitwell <[email protected]> | 2003-12-09 14:18:41 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2003-12-09 14:18:41 +0000 |
| commit | a70fa7129cf8549f8c01b01d5e317a5a07485706 (patch) | |
| tree | 4bd3eb38f6f93aa5a392deb321cd79b4d23119e2 /src | |
| parent | 8a340279f4366e097adce479241a2ede8e977128 (diff) | |
clean up some compiler warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_maos_arrays.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_tcl.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_vtxfmt.c | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_maos_arrays.c b/src/mesa/drivers/dri/r200/r200_maos_arrays.c index b442dce207a..6c6013054ab 100644 --- a/src/mesa/drivers/dri/r200/r200_maos_arrays.c +++ b/src/mesa/drivers/dri/r200/r200_maos_arrays.c @@ -69,7 +69,7 @@ static void emit_ubyte_rgba3( GLcontext *ctx, if (R200_DEBUG & DEBUG_VERTS) fprintf(stderr, "%s count %d stride %d out %p\n", - __FUNCTION__, count, stride, out); + __FUNCTION__, count, stride, (void *)out); for (i = 0; i < count; i++) { out->red = *data; @@ -129,6 +129,7 @@ static void emit_ubyte_rgba4( GLcontext *ctx, } +#if 0 static void emit_ubyte_rgba( GLcontext *ctx, struct r200_dma_region *rvb, char *data, @@ -172,6 +173,7 @@ static void emit_ubyte_rgba( GLcontext *ctx, break; } } +#endif static void emit_vec4( GLcontext *ctx, @@ -233,7 +235,7 @@ static void emit_vec12( GLcontext *ctx, if (R200_DEBUG & DEBUG_VERTS) fprintf(stderr, "%s count %d stride %d out %p data %p\n", - __FUNCTION__, count, stride, out, data); + __FUNCTION__, count, stride, out, (void *)data); if (stride == 12) COPY_DWORDS( out, data, count*3 ); diff --git a/src/mesa/drivers/dri/r200/r200_tcl.c b/src/mesa/drivers/dri/r200/r200_tcl.c index 60e281ffaf3..9b1f522e2c5 100644 --- a/src/mesa/drivers/dri/r200/r200_tcl.c +++ b/src/mesa/drivers/dri/r200/r200_tcl.c @@ -259,7 +259,7 @@ static GLboolean r200_run_tcl_render( GLcontext *ctx, r200ContextPtr rmesa = R200_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/r200/r200_vtxfmt.c b/src/mesa/drivers/dri/r200/r200_vtxfmt.c index 2e742d4d04f..188bed28765 100644 --- a/src/mesa/drivers/dri/r200/r200_vtxfmt.c +++ b/src/mesa/drivers/dri/r200/r200_vtxfmt.c @@ -562,7 +562,8 @@ static void wrap_buffer( void ) for (i = 0 ; i < nrverts; i++) { if (R200_DEBUG & DEBUG_VERTS) { int j; - fprintf(stderr, "re-emit vertex %d to %p\n", i, rmesa->vb.dmaptr); + fprintf(stderr, "re-emit vertex %d to %p\n", i, + (void *)rmesa->vb.dmaptr); if (R200_DEBUG & DEBUG_VERBOSE) for (j = 0 ; j < rmesa->vb.vertex_size; j++) fprintf(stderr, "\t%08x/%f\n", *(int*)&tmp[i][j], tmp[i][j]); |