casts for g++

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index f6193aec556d43f06299425ccd864058b2330f86..53783b10e13b88d27f50f178c26e70a4a1214f97 100644 (file)
--- 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 c547a2c74db0276bf982b0f733d7e6208156c3cd..d8ef3bbb315b9762b9e87e17c9df7fd6a0c4f086 100644 (file)
--- 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 955f14f6b1812770a49e29b7d498d6e7534a3916..648ad8fe34bc4d4145f22b1244dc7aa64a7007a9 100644 (file)
--- 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 dfd404e4004fd45d3994003c22219568a5d30955..fac7dbd070f09110f0508cd996e9c97991121042 100644 (file)
--- 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 */