fix some signed vs unsigned warnings

This commit is contained in:
Dave Airlie
2005-02-14 09:27:38 +00:00
parent fbdd7a5e74
commit 8d12a6d537
9 changed files with 17 additions and 17 deletions

View File

@@ -111,7 +111,7 @@ static void TAG(WriteDepthPixels)( GLcontext *ctx,
{ {
HW_WRITE_LOCK() HW_WRITE_LOCK()
{ {
GLint i; GLuint i;
LOCAL_DEPTH_VARS; LOCAL_DEPTH_VARS;
if ( DBG ) fprintf( stderr, "WriteDepthPixels\n" ); if ( DBG ) fprintf( stderr, "WriteDepthPixels\n" );
@@ -178,7 +178,7 @@ static void TAG(ReadDepthPixels)( GLcontext *ctx, GLuint n,
{ {
HW_READ_LOCK() HW_READ_LOCK()
{ {
GLint i; GLuint i;
LOCAL_DEPTH_VARS; LOCAL_DEPTH_VARS;
if ( DBG ) fprintf( stderr, "ReadDepthPixels\n" ); if ( DBG ) fprintf( stderr, "ReadDepthPixels\n" );

View File

@@ -1573,7 +1573,7 @@ __driUtilCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
* *
* \sa __glXGetInternalVersion(). * \sa __glXGetInternalVersion().
*/ */
int driCompareGLXAPIVersion( GLuint required_version ) int driCompareGLXAPIVersion( GLint required_version )
{ {
if ( api_ver > required_version ) { if ( api_ver > required_version ) {
return 1; return 1;

View File

@@ -561,7 +561,7 @@ __driUtilCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
/* Test the version of the internal GLX API. Returns a value like strcmp. */ /* Test the version of the internal GLX API. Returns a value like strcmp. */
extern int extern int
driCompareGLXAPIVersion( GLuint required_version ); driCompareGLXAPIVersion( GLint required_version );
extern float extern float
driCalculateSwapUsage( __DRIdrawablePrivate *dPriv, driCalculateSwapUsage( __DRIdrawablePrivate *dPriv,

View File

@@ -145,7 +145,7 @@ static void TAG(WriteRGBAPixels)( const GLcontext *ctx,
{ {
HW_WRITE_LOCK() HW_WRITE_LOCK()
{ {
GLint i; GLuint i;
LOCAL_VARS; LOCAL_VARS;
if (DBG) fprintf(stderr, "WriteRGBAPixels\n"); if (DBG) fprintf(stderr, "WriteRGBAPixels\n");
@@ -229,7 +229,7 @@ static void TAG(WriteMonoRGBAPixels)( const GLcontext *ctx,
{ {
HW_WRITE_LOCK() HW_WRITE_LOCK()
{ {
GLint i; GLuint i;
LOCAL_VARS; LOCAL_VARS;
INIT_MONO_PIXEL(p, color); INIT_MONO_PIXEL(p, color);
@@ -293,7 +293,7 @@ static void TAG(ReadRGBAPixels)( const GLcontext *ctx,
{ {
HW_READ_LOCK() HW_READ_LOCK()
{ {
GLint i; GLuint i;
LOCAL_VARS; LOCAL_VARS;
if (DBG) fprintf(stderr, "ReadRGBAPixels\n"); if (DBG) fprintf(stderr, "ReadRGBAPixels\n");

View File

@@ -66,7 +66,7 @@ static void TAG(WriteStencilPixels)( GLcontext *ctx,
{ {
HW_WRITE_LOCK() HW_WRITE_LOCK()
{ {
GLint i; GLuint i;
LOCAL_STENCIL_VARS; LOCAL_STENCIL_VARS;
if (DBG) fprintf(stderr, "WriteStencilPixels\n"); if (DBG) fprintf(stderr, "WriteStencilPixels\n");
@@ -121,7 +121,7 @@ static void TAG(ReadStencilPixels)( GLcontext *ctx, GLuint n,
{ {
HW_READ_LOCK() HW_READ_LOCK()
{ {
GLint i; GLuint i;
LOCAL_STENCIL_VARS; LOCAL_STENCIL_VARS;
if (DBG) fprintf(stderr, "ReadStencilPixels\n"); if (DBG) fprintf(stderr, "ReadStencilPixels\n");

View File

@@ -188,7 +188,7 @@ static void printLocalLRU( driTexHeap * heap, const char *callername )
static void printGlobalLRU( driTexHeap * heap, const char *callername ) static void printGlobalLRU( driTexHeap * heap, const char *callername )
{ {
drmTextureRegionPtr list = heap->global_regions; drmTextureRegionPtr list = heap->global_regions;
int i, j; unsigned int i, j;
fprintf( stderr, "%s in %s:\nGlobal LRU, heap %d list %p:\n", fprintf( stderr, "%s in %s:\nGlobal LRU, heap %d list %p:\n",
__FUNCTION__, callername, heap->heapId, (void *)list ); __FUNCTION__, callername, heap->heapId, (void *)list );

View File

@@ -331,7 +331,7 @@ i810DestroyContext(__DRIcontextPrivate *driContextPriv)
/* This share group is about to go away, free our private /* This share group is about to go away, free our private
* texture object data. * texture object data.
*/ */
int i; unsigned int i;
for ( i = 0 ; i < imesa->nr_heaps ; i++ ) { for ( i = 0 ; i < imesa->nr_heaps ; i++ ) {
driDestroyTextureHeap( imesa->texture_heaps[ i ] ); driDestroyTextureHeap( imesa->texture_heaps[ i ] );

View File

@@ -55,7 +55,7 @@ static void i810Clear( GLcontext *ctx, GLbitfield mask, GLboolean all,
__DRIdrawablePrivate *dPriv = imesa->driDrawable; __DRIdrawablePrivate *dPriv = imesa->driDrawable;
const GLuint colorMask = *((GLuint *) &ctx->Color.ColorMask); const GLuint colorMask = *((GLuint *) &ctx->Color.ColorMask);
drmI810Clear clear; drmI810Clear clear;
int i; unsigned int i;
clear.flags = 0; clear.flags = 0;
clear.clear_color = imesa->ClearColor; clear.clear_color = imesa->ClearColor;
@@ -63,12 +63,12 @@ static void i810Clear( GLcontext *ctx, GLbitfield mask, GLboolean all,
I810_FIREVERTICES( imesa ); I810_FIREVERTICES( imesa );
if ((mask & DD_FRONT_LEFT_BIT) && colorMask == ~0) { if ((mask & DD_FRONT_LEFT_BIT) && colorMask == ~0U) {
clear.flags |= I810_FRONT; clear.flags |= I810_FRONT;
mask &= ~DD_FRONT_LEFT_BIT; 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; clear.flags |= I810_BACK;
mask &= ~DD_BACK_LEFT_BIT; mask &= ~DD_BACK_LEFT_BIT;
} }
@@ -89,7 +89,7 @@ static void i810Clear( GLcontext *ctx, GLbitfield mask, GLboolean all,
for (i = 0 ; i < imesa->numClipRects ; ) 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 *box = imesa->pClipRects;
drm_clip_rect_t *b = (drm_clip_rect_t *)imesa->sarea->boxes; drm_clip_rect_t *b = (drm_clip_rect_t *)imesa->sarea->boxes;
int n = 0; int n = 0;

View File

@@ -75,7 +75,7 @@ do { \
} while (0) } while (0)
#endif #endif
static void __inline__ i810_draw_triangle( i810ContextPtr imesa, static __inline__ void i810_draw_triangle( i810ContextPtr imesa,
i810VertexPtr v0, i810VertexPtr v0,
i810VertexPtr v1, i810VertexPtr v1,
i810VertexPtr v2 ) 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 v0,
i810VertexPtr v1, i810VertexPtr v1,
i810VertexPtr v2, i810VertexPtr v2,