diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-11-25 16:21:51 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-11-25 16:21:51 +0000 |
commit | 2c9f50dd4acc65ddfeb8e3fde98137711167e579 (patch) | |
tree | 2301c8a7bab79709f98e0507f97eab0f15817440 /src/mesa/main | |
parent | 3bc7f3f864e76e20c644910620f22b23e03547dc (diff) |
casts for g++
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/api_validate.c | 2 | ||||
-rw-r--r-- | src/mesa/main/dlist.c | 2 | ||||
-rw-r--r-- | src/mesa/main/image.c | 2 | ||||
-rw-r--r-- | src/mesa/main/rastpos.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c index f6193aec556..53783b10e13 100644 --- a/src/mesa/main/api_validate.c +++ b/src/mesa/main/api_validate.c @@ -195,7 +195,7 @@ _mesa_validate_DrawArrays(GLcontext *ctx, return GL_FALSE; if (ctx->Const.CheckArrayBounds) { - if (start + count > ctx->Array._MaxElement) + if (start + count > (GLint) ctx->Array._MaxElement) return GL_FALSE; } diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index c547a2c74db..d8ef3bbb315 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -4753,7 +4753,7 @@ static void save_Indexf( GLfloat x ) ctx->ListState.CurrentIndex = x; if (ctx->ExecuteFlag) { - (*ctx->Exec->Indexi)( x ); + (*ctx->Exec->Indexi)( (GLint) x ); } } diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c index 955f14f6b18..648ad8fe34b 100644 --- a/src/mesa/main/image.c +++ b/src/mesa/main/image.c @@ -3809,7 +3809,7 @@ _mesa_pack_stencil_span( const GLcontext *ctx, GLuint n, GLhalfNV *dst = (GLhalfNV *) dest; GLuint i; for (i=0;i<n;i++) { - dst[i] = _mesa_half_to_float(source[i]); + dst[i] = _mesa_float_to_half( (float) source[i] ); } if (dstPacking->SwapBytes) { _mesa_swap2( (GLushort *) dst, n ); diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c index dfd404e4004..fac7dbd070f 100644 --- a/src/mesa/main/rastpos.c +++ b/src/mesa/main/rastpos.c @@ -345,7 +345,7 @@ raster_pos4f(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z, GLfloat w) ctx->Current.Attrib[VERT_ATTRIB_COLOR1]); } else { - ctx->Current.RasterIndex = ctx->Current.Index; + ctx->Current.RasterIndex = (GLuint) ctx->Current.Index; } } @@ -636,7 +636,7 @@ window_pos3f(GLfloat x, GLfloat y, GLfloat z) = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3], 0.0F, 1.0F); } else { - ctx->Current.RasterIndex = ctx->Current.Index; + ctx->Current.RasterIndex = (GLuint) ctx->Current.Index; } /* raster texcoord = current texcoord */ |