From afa446db83ecf5dcb38ce46648fb12911628de32 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 21 Jan 2004 17:03:58 +0000 Subject: [PATCH] Silence some compiler warnings. --- src/mesa/drivers/dri/mga/mga_xmesa.c | 2 +- src/mesa/drivers/dri/mga/mgacontext.h | 4 ++-- src/mesa/drivers/dri/r200/r200_context.c | 2 +- src/mesa/drivers/dri/r200/r200_context.h | 4 ++-- src/mesa/drivers/dri/radeon/radeon_context.c | 6 +++--- src/mesa/drivers/dri/radeon/radeon_context.h | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c index 6c26489d3cc..a3eb758d12f 100644 --- a/src/mesa/drivers/dri/mga/mga_xmesa.c +++ b/src/mesa/drivers/dri/mga/mga_xmesa.c @@ -334,7 +334,7 @@ static const struct dri_debug_control debug_control[] = static int -get_ust_nop( uint64_t * ust ) +get_ust_nop( int64_t * ust ) { *ust = 1; return 0; diff --git a/src/mesa/drivers/dri/mga/mgacontext.h b/src/mesa/drivers/dri/mga/mgacontext.h index 7bb8ff3bef0..97ea04256d1 100644 --- a/src/mesa/drivers/dri/mga/mgacontext.h +++ b/src/mesa/drivers/dri/mga/mgacontext.h @@ -261,8 +261,8 @@ struct mga_context_t { GLuint vbl_seq; GLuint vblank_flags; - uint64_t swap_ust; - uint64_t swap_missed_ust; + int64_t swap_ust; + int64_t swap_missed_ust; GLuint swap_count; GLuint swap_missed_count; diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index cab967d9db3..03a3a8ed895 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -222,7 +222,7 @@ static const struct dri_debug_control debug_control[] = static int -get_ust_nop( uint64_t * ust ) +get_ust_nop( int64_t * ust ) { *ust = 1; return 0; diff --git a/src/mesa/drivers/dri/r200/r200_context.h b/src/mesa/drivers/dri/r200/r200_context.h index 029dfde6642..5de1cb6eedf 100644 --- a/src/mesa/drivers/dri/r200/r200_context.h +++ b/src/mesa/drivers/dri/r200/r200_context.h @@ -836,8 +836,8 @@ struct r200_context { GLuint vbl_seq; GLuint vblank_flags; - uint64_t swap_ust; - uint64_t swap_missed_ust; + int64_t swap_ust; + int64_t swap_missed_ust; GLuint swap_count; GLuint swap_missed_count; diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index 492f80f597a..e61dfcad5db 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -204,7 +204,7 @@ static const struct dri_debug_control debug_control[] = static int -get_ust_nop( uint64_t * ust ) +get_ust_nop( int64_t * ust ) { *ust = 1; return 0; @@ -577,7 +577,7 @@ radeonMakeCurrent( __DRIcontextPrivate *driContextPriv, (radeonContextPtr) driContextPriv->driverPrivate; if (RADEON_DEBUG & DEBUG_DRI) - fprintf(stderr, "%s ctx %p\n", __FUNCTION__, newCtx->glCtx); + fprintf(stderr, "%s ctx %p\n", __FUNCTION__, (void *) newCtx->glCtx); if ( newCtx->dri.drawable != driDrawPriv ) { driDrawableInitVBlank( driDrawPriv, newCtx->vblank_flags ); @@ -617,7 +617,7 @@ radeonUnbindContext( __DRIcontextPrivate *driContextPriv ) radeonContextPtr rmesa = (radeonContextPtr) driContextPriv->driverPrivate; if (RADEON_DEBUG & DEBUG_DRI) - fprintf(stderr, "%s ctx %p\n", __FUNCTION__, rmesa->glCtx); + fprintf(stderr, "%s ctx %p\n", __FUNCTION__, (void *) rmesa->glCtx); return GL_TRUE; } diff --git a/src/mesa/drivers/dri/radeon/radeon_context.h b/src/mesa/drivers/dri/radeon/radeon_context.h index 4860d404e20..0a32fd8aa3b 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.h +++ b/src/mesa/drivers/dri/radeon/radeon_context.h @@ -749,8 +749,8 @@ struct radeon_context { GLuint vbl_seq; GLuint vblank_flags; - uint64_t swap_ust; - uint64_t swap_missed_ust; + int64_t swap_ust; + int64_t swap_missed_ust; GLuint swap_count; GLuint swap_missed_count; -- 2.30.2