diff options
| author | Karl Schultz <kschultz@freedesktop.org> | 2004-01-13 01:11:09 +0000 |
|---|---|---|
| committer | Karl Schultz <kschultz@freedesktop.org> | 2004-01-13 01:11:09 +0000 |
| commit | c6c4cd8b6f1b4b34ad84bdb31095458bde011fb0 (patch) | |
| tree | ed250431085c5b0819113c3a907312b668a94b1b /src/mesa | |
| parent | 4f7a8f3a4753d4662c311e0dd99d94cb7dcd0f71 (diff) | |
silence compiler warnings
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/tnl/t_save_loopback.c | 2 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vertex.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/tnl/t_save_loopback.c b/src/mesa/tnl/t_save_loopback.c index e1a60baaca..fec0ea5b64 100644 --- a/src/mesa/tnl/t_save_loopback.c +++ b/src/mesa/tnl/t_save_loopback.c @@ -169,7 +169,7 @@ static void index_attr1fv(GLcontext *ctx, GLint target, const GLfloat *v) static void edgeflag_attr1fv(GLcontext *ctx, GLint target, const GLfloat *v) { - ctx->Exec->EdgeFlag((v[0] == 1.0)); + ctx->Exec->EdgeFlag((GLboolean)(v[0] == 1.0)); } struct loopback_attr { diff --git a/src/mesa/tnl/t_vertex.c b/src/mesa/tnl/t_vertex.c index 7fe7194a3d..a798f3e149 100644 --- a/src/mesa/tnl/t_vertex.c +++ b/src/mesa/tnl/t_vertex.c @@ -675,7 +675,7 @@ static void generic_emit( GLcontext *ctx, struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx); struct tnl_clipspace_attr *a = vtx->attr; GLubyte *v = (GLubyte *)dest; - int i, j; + GLuint i, j; GLuint count = vtx->attr_count; GLuint stride; @@ -717,7 +717,7 @@ static void generic_interp( GLcontext *ctx, if (tnl->NeedNdcCoords) { const GLfloat *dstclip = VB->ClipPtr->data[edst]; if (dstclip[3] != 0.0) { - const GLfloat w = 1.0 / dstclip[3]; + const GLfloat w = 1.0f / dstclip[3]; GLfloat pos[4]; pos[0] = dstclip[0] * w; @@ -923,7 +923,7 @@ void _tnl_get_attr( GLcontext *ctx, const void *vin, int j; for (j = 0; j < attr_count; j++) { - if (a[j].attrib == attr) { + if (a[j].attrib == (int)attr) { a[j].extract( &a[j], dest, (GLubyte *)vin + a[j].vertoffset ); return; } @@ -958,7 +958,7 @@ GLuint _tnl_install_attrs( GLcontext *ctx, const struct tnl_attr_map *map, { struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx); int offset = 0; - int i; + GLuint i; assert(nr < _TNL_ATTRIB_MAX); assert(nr == 0 || map[0].attrib == VERT_ATTRIB_POS); |