From 8d12a6d537ca346291bc3e3bc90cc73509f4b419 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 14 Feb 2005 09:27:38 +0000 Subject: [PATCH] fix some signed vs unsigned warnings --- src/mesa/drivers/dri/common/depthtmp.h | 4 ++-- src/mesa/drivers/dri/common/dri_util.c | 2 +- src/mesa/drivers/dri/common/dri_util.h | 2 +- src/mesa/drivers/dri/common/spantmp.h | 6 +++--- src/mesa/drivers/dri/common/stenciltmp.h | 4 ++-- src/mesa/drivers/dri/common/texmem.c | 2 +- src/mesa/drivers/dri/i810/i810context.c | 2 +- src/mesa/drivers/dri/i810/i810ioctl.c | 8 ++++---- src/mesa/drivers/dri/i810/i810tris.c | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/mesa/drivers/dri/common/depthtmp.h b/src/mesa/drivers/dri/common/depthtmp.h index ec79aca30f7..ad26e6b8914 100644 --- a/src/mesa/drivers/dri/common/depthtmp.h +++ b/src/mesa/drivers/dri/common/depthtmp.h @@ -111,7 +111,7 @@ static void TAG(WriteDepthPixels)( GLcontext *ctx, { HW_WRITE_LOCK() { - GLint i; + GLuint i; LOCAL_DEPTH_VARS; if ( DBG ) fprintf( stderr, "WriteDepthPixels\n" ); @@ -178,7 +178,7 @@ static void TAG(ReadDepthPixels)( GLcontext *ctx, GLuint n, { HW_READ_LOCK() { - GLint i; + GLuint i; LOCAL_DEPTH_VARS; if ( DBG ) fprintf( stderr, "ReadDepthPixels\n" ); diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index a4de0b6496a..302994e0c23 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -1573,7 +1573,7 @@ __driUtilCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, * * \sa __glXGetInternalVersion(). */ -int driCompareGLXAPIVersion( GLuint required_version ) +int driCompareGLXAPIVersion( GLint required_version ) { if ( api_ver > required_version ) { return 1; diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h index 001313c4c8a..6ef1b114f9c 100644 --- a/src/mesa/drivers/dri/common/dri_util.h +++ b/src/mesa/drivers/dri/common/dri_util.h @@ -561,7 +561,7 @@ __driUtilCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, /* Test the version of the internal GLX API. Returns a value like strcmp. */ extern int -driCompareGLXAPIVersion( GLuint required_version ); +driCompareGLXAPIVersion( GLint required_version ); extern float driCalculateSwapUsage( __DRIdrawablePrivate *dPriv, diff --git a/src/mesa/drivers/dri/common/spantmp.h b/src/mesa/drivers/dri/common/spantmp.h index 94126ecbaf3..96f26333fcb 100644 --- a/src/mesa/drivers/dri/common/spantmp.h +++ b/src/mesa/drivers/dri/common/spantmp.h @@ -145,7 +145,7 @@ static void TAG(WriteRGBAPixels)( const GLcontext *ctx, { HW_WRITE_LOCK() { - GLint i; + GLuint i; LOCAL_VARS; if (DBG) fprintf(stderr, "WriteRGBAPixels\n"); @@ -229,7 +229,7 @@ static void TAG(WriteMonoRGBAPixels)( const GLcontext *ctx, { HW_WRITE_LOCK() { - GLint i; + GLuint i; LOCAL_VARS; INIT_MONO_PIXEL(p, color); @@ -293,7 +293,7 @@ static void TAG(ReadRGBAPixels)( const GLcontext *ctx, { HW_READ_LOCK() { - GLint i; + GLuint i; LOCAL_VARS; if (DBG) fprintf(stderr, "ReadRGBAPixels\n"); diff --git a/src/mesa/drivers/dri/common/stenciltmp.h b/src/mesa/drivers/dri/common/stenciltmp.h index 285d8e52917..dfbe665407d 100644 --- a/src/mesa/drivers/dri/common/stenciltmp.h +++ b/src/mesa/drivers/dri/common/stenciltmp.h @@ -66,7 +66,7 @@ static void TAG(WriteStencilPixels)( GLcontext *ctx, { HW_WRITE_LOCK() { - GLint i; + GLuint i; LOCAL_STENCIL_VARS; if (DBG) fprintf(stderr, "WriteStencilPixels\n"); @@ -121,7 +121,7 @@ static void TAG(ReadStencilPixels)( GLcontext *ctx, GLuint n, { HW_READ_LOCK() { - GLint i; + GLuint i; LOCAL_STENCIL_VARS; if (DBG) fprintf(stderr, "ReadStencilPixels\n"); diff --git a/src/mesa/drivers/dri/common/texmem.c b/src/mesa/drivers/dri/common/texmem.c index 192b7870491..acefce0f597 100644 --- a/src/mesa/drivers/dri/common/texmem.c +++ b/src/mesa/drivers/dri/common/texmem.c @@ -188,7 +188,7 @@ static void printLocalLRU( driTexHeap * heap, const char *callername ) static void printGlobalLRU( driTexHeap * heap, const char *callername ) { drmTextureRegionPtr list = heap->global_regions; - int i, j; + unsigned int i, j; fprintf( stderr, "%s in %s:\nGlobal LRU, heap %d list %p:\n", __FUNCTION__, callername, heap->heapId, (void *)list ); diff --git a/src/mesa/drivers/dri/i810/i810context.c b/src/mesa/drivers/dri/i810/i810context.c index bbdd5e17867..bf1b2fc93c6 100644 --- a/src/mesa/drivers/dri/i810/i810context.c +++ b/src/mesa/drivers/dri/i810/i810context.c @@ -331,7 +331,7 @@ i810DestroyContext(__DRIcontextPrivate *driContextPriv) /* This share group is about to go away, free our private * texture object data. */ - int i; + unsigned int i; for ( i = 0 ; i < imesa->nr_heaps ; i++ ) { driDestroyTextureHeap( imesa->texture_heaps[ i ] ); diff --git a/src/mesa/drivers/dri/i810/i810ioctl.c b/src/mesa/drivers/dri/i810/i810ioctl.c index c62e5817899..50ddd0976f2 100644 --- a/src/mesa/drivers/dri/i810/i810ioctl.c +++ b/src/mesa/drivers/dri/i810/i810ioctl.c @@ -55,7 +55,7 @@ static void i810Clear( GLcontext *ctx, GLbitfield mask, GLboolean all, __DRIdrawablePrivate *dPriv = imesa->driDrawable; const GLuint colorMask = *((GLuint *) &ctx->Color.ColorMask); drmI810Clear clear; - int i; + unsigned int i; clear.flags = 0; clear.clear_color = imesa->ClearColor; @@ -63,12 +63,12 @@ static void i810Clear( GLcontext *ctx, GLbitfield mask, GLboolean all, I810_FIREVERTICES( imesa ); - if ((mask & DD_FRONT_LEFT_BIT) && colorMask == ~0) { + if ((mask & DD_FRONT_LEFT_BIT) && colorMask == ~0U) { clear.flags |= I810_FRONT; mask &= ~DD_FRONT_LEFT_BIT; } - if ((mask & DD_BACK_LEFT_BIT) && colorMask == ~0) { + if ((mask & DD_BACK_LEFT_BIT) && colorMask == ~0U) { clear.flags |= I810_BACK; mask &= ~DD_BACK_LEFT_BIT; } @@ -89,7 +89,7 @@ static void i810Clear( GLcontext *ctx, GLbitfield mask, GLboolean all, for (i = 0 ; i < imesa->numClipRects ; ) { - int nr = MIN2(i + I810_NR_SAREA_CLIPRECTS, imesa->numClipRects); + unsigned int nr = MIN2(i + I810_NR_SAREA_CLIPRECTS, imesa->numClipRects); drm_clip_rect_t *box = imesa->pClipRects; drm_clip_rect_t *b = (drm_clip_rect_t *)imesa->sarea->boxes; int n = 0; diff --git a/src/mesa/drivers/dri/i810/i810tris.c b/src/mesa/drivers/dri/i810/i810tris.c index 5b2ea018e1e..3e09427bb94 100644 --- a/src/mesa/drivers/dri/i810/i810tris.c +++ b/src/mesa/drivers/dri/i810/i810tris.c @@ -75,7 +75,7 @@ do { \ } while (0) #endif -static void __inline__ i810_draw_triangle( i810ContextPtr imesa, +static __inline__ void i810_draw_triangle( i810ContextPtr imesa, i810VertexPtr v0, i810VertexPtr v1, i810VertexPtr v2 ) @@ -90,7 +90,7 @@ static void __inline__ i810_draw_triangle( i810ContextPtr imesa, } -static void __inline__ i810_draw_quad( i810ContextPtr imesa, +static __inline__ void i810_draw_quad( i810ContextPtr imesa, i810VertexPtr v0, i810VertexPtr v1, i810VertexPtr v2, -- 2.30.2