diff options
Diffstat (limited to 'src/mesa/drivers/dri')
| -rw-r--r-- | src/mesa/drivers/dri/ffb/ffb_context.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r128/r128_ioctl.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r128/r128_ioctl.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/ffb/ffb_context.h b/src/mesa/drivers/dri/ffb/ffb_context.h index 33f6f7cff80..df1b65d748f 100644 --- a/src/mesa/drivers/dri/ffb/ffb_context.h +++ b/src/mesa/drivers/dri/ffb/ffb_context.h @@ -294,13 +294,13 @@ do { if ((STATE_MASK) & ~((FMESA)->state_dirty)) { \ * 1.0 would produce a value of 0x0fffffff in the actual Z * buffer, which is the maximum value. * - * Mesa's depth type is a 32-bit int, so we use the following macro + * Mesa's depth type is a 32-bit uint, so we use the following macro * to convert to/from FFB hw Z values. Note we also have to clear * out the top bits as that is where the Y (stencil) buffer is stored * and during hw Z buffer reads it is always there. (During writes * we tell the hw to discard those top 4 bits). */ -#define Z_TO_MESA(VAL) ((GLdepth)(((VAL) & 0x0fffffff) << (32 - 28))) +#define Z_TO_MESA(VAL) ((GLuint)(((VAL) & 0x0fffffff) << (32 - 28))) #define Z_FROM_MESA(VAL) (((GLuint)((GLdouble)(VAL))) >> (32 - 28)) #endif /* !(_FFB_CONTEXT_H) */ diff --git a/src/mesa/drivers/dri/r128/r128_ioctl.c b/src/mesa/drivers/dri/r128/r128_ioctl.c index 150d62577ed..8f148548872 100644 --- a/src/mesa/drivers/dri/r128/r128_ioctl.c +++ b/src/mesa/drivers/dri/r128/r128_ioctl.c @@ -539,7 +539,7 @@ static void r128Clear( GLcontext *ctx, GLbitfield mask, GLboolean all, void r128WriteDepthSpanLocked( r128ContextPtr rmesa, GLuint n, GLint x, GLint y, - const GLdepth depth[], + const GLuint depth[], const GLubyte mask[] ) { drm_clip_rect_t *pbox = rmesa->pClipRects; @@ -602,7 +602,7 @@ void r128WriteDepthSpanLocked( r128ContextPtr rmesa, void r128WriteDepthPixelsLocked( r128ContextPtr rmesa, GLuint n, const GLint x[], const GLint y[], - const GLdepth depth[], + const GLuint depth[], const GLubyte mask[] ) { drm_clip_rect_t *pbox = rmesa->pClipRects; diff --git a/src/mesa/drivers/dri/r128/r128_ioctl.h b/src/mesa/drivers/dri/r128/r128_ioctl.h index d2f2dded8b5..95779f09bef 100644 --- a/src/mesa/drivers/dri/r128/r128_ioctl.h +++ b/src/mesa/drivers/dri/r128/r128_ioctl.h @@ -75,11 +75,11 @@ extern void r128FireBlitLocked( r128ContextPtr rmesa, drmBufPtr buffer, extern void r128WriteDepthSpanLocked( r128ContextPtr rmesa, GLuint n, GLint x, GLint y, - const GLdepth depth[], + const GLuint depth[], const GLubyte mask[] ); extern void r128WriteDepthPixelsLocked( r128ContextPtr rmesa, GLuint n, const GLint x[], const GLint y[], - const GLdepth depth[], + const GLuint depth[], const GLubyte mask[] ); extern void r128ReadDepthSpanLocked( r128ContextPtr rmesa, GLuint n, GLint x, GLint y ); |