From 6ec6b845fdf3c44436028ad6fff9471d18928719 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 30 Oct 2002 19:49:29 +0000 Subject: [PATCH] s/BZERO/_mesa_bzero/ --- src/mesa/drivers/osmesa/osmesa.c | 4 ++-- src/mesa/main/context.c | 4 ++-- src/mesa/main/imports.h | 5 ++--- src/mesa/swrast/s_accum.c | 5 +++-- src/mesa/swrast/s_depth.c | 20 ++++++++++---------- src/mesa/swrast/s_span.c | 8 ++++---- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c index f497013..35cf3c7 100644 --- a/src/mesa/drivers/osmesa/osmesa.c +++ b/src/mesa/drivers/osmesa/osmesa.c @@ -1,4 +1,4 @@ -/* $Id: osmesa.c,v 1.95 2002/10/29 22:32:50 brianp Exp $ */ +/* $Id: osmesa.c,v 1.96 2002/10/30 19:49:30 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -868,7 +868,7 @@ static void clear( GLcontext *ctx, GLbitfield mask, GLboolean all, } } else { - BZERO(ptr4, n * sizeof(GLuint)); + _mesa_bzero(ptr4, n * sizeof(GLuint)); } } else { diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 4f93b1a..f43b870 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1,4 +1,4 @@ -/* $Id: context.c,v 1.187 2002/10/29 15:04:35 brianp Exp $ */ +/* $Id: context.c,v 1.188 2002/10/30 19:49:29 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -451,7 +451,7 @@ _mesa_initialize_framebuffer( GLframebuffer *buffer, assert(buffer); assert(visual); - BZERO(buffer, sizeof(GLframebuffer)); + _mesa_bzero(buffer, sizeof(GLframebuffer)); /* sanity checks */ if (softwareDepth ) { diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h index 463b9ca..35c06d2 100644 --- a/src/mesa/main/imports.h +++ b/src/mesa/main/imports.h @@ -1,8 +1,8 @@ -/* $Id: imports.h,v 1.7 2002/10/25 21:06:29 brianp Exp $ */ +/* $Id: imports.h,v 1.8 2002/10/30 19:49:29 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 4.1 + * Version: 5.0 * * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * @@ -49,7 +49,6 @@ #define MEMCPY( DST, SRC, BYTES) _mesa_memcpy(DST, SRC, BYTES) #define MEMSET( DST, VAL, N ) _mesa_memset(DST, VAL, N) -#define BZERO( ADDR, N ) _mesa_bzero(ADDR, N) /* MACs and BeOS don't support static larger than 32kb, so... */ diff --git a/src/mesa/swrast/s_accum.c b/src/mesa/swrast/s_accum.c index 18f82eb..b424400 100644 --- a/src/mesa/swrast/s_accum.c +++ b/src/mesa/swrast/s_accum.c @@ -1,4 +1,4 @@ -/* $Id: s_accum.c,v 1.19 2002/10/24 23:57:24 brianp Exp $ */ +/* $Id: s_accum.c,v 1.20 2002/10/30 19:49:30 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -195,7 +195,8 @@ _mesa_clear_accum_buffer( GLcontext *ctx ) ctx->Accum.ClearColor[2]==0.0 && ctx->Accum.ClearColor[3]==0.0) { /* Black */ - BZERO( ctx->DrawBuffer->Accum, buffersize * 4 * sizeof(GLaccum) ); + _mesa_bzero( ctx->DrawBuffer->Accum, + buffersize * 4 * sizeof(GLaccum) ); } else { /* Not black */ diff --git a/src/mesa/swrast/s_depth.c b/src/mesa/swrast/s_depth.c index 4d36d1c..b15638b 100644 --- a/src/mesa/swrast/s_depth.c +++ b/src/mesa/swrast/s_depth.c @@ -1,4 +1,4 @@ -/* $Id: s_depth.c,v 1.24 2002/10/24 23:57:24 brianp Exp $ */ +/* $Id: s_depth.c,v 1.25 2002/10/30 19:49:30 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -290,7 +290,7 @@ depth_test_span16( GLcontext *ctx, GLuint n, } break; case GL_NEVER: - BZERO(mask, n * sizeof(GLubyte)); + _mesa_bzero(mask, n * sizeof(GLubyte)); break; default: _mesa_problem(ctx, "Bad depth func in depth_test_span16"); @@ -519,7 +519,7 @@ depth_test_span32( GLcontext *ctx, GLuint n, } break; case GL_NEVER: - BZERO(mask, n * sizeof(GLubyte)); + _mesa_bzero(mask, n * sizeof(GLubyte)); break; default: _mesa_problem(ctx, "Bad depth func in depth_test_span32"); @@ -829,7 +829,7 @@ software_depth_test_pixels16( GLcontext *ctx, GLuint n, break; case GL_NEVER: /* depth test never passes */ - BZERO(mask, n * sizeof(GLubyte)); + _mesa_bzero(mask, n * sizeof(GLubyte)); break; default: _mesa_problem(ctx, "Bad depth func in software_depth_test_pixels"); @@ -1075,7 +1075,7 @@ software_depth_test_pixels32( GLcontext *ctx, GLuint n, break; case GL_NEVER: /* depth test never passes */ - BZERO(mask, n * sizeof(GLubyte)); + _mesa_bzero(mask, n * sizeof(GLubyte)); break; default: _mesa_problem(ctx, "Bad depth func in software_depth_test_pixels"); @@ -1309,7 +1309,7 @@ hardware_depth_test_pixels( GLcontext *ctx, GLuint n, GLdepth zbuffer[], break; case GL_NEVER: /* depth test never passes */ - BZERO(mask, n * sizeof(GLubyte)); + _mesa_bzero(mask, n * sizeof(GLubyte)); break; default: _mesa_problem(ctx, "Bad depth func in hardware_depth_test_pixels"); @@ -1432,7 +1432,7 @@ _mesa_read_depth_span( GLcontext *ctx, } else { /* no depth buffer */ - BZERO(depth, n * sizeof(GLfloat)); + _mesa_bzero(depth, n * sizeof(GLfloat)); } } @@ -1511,7 +1511,7 @@ _mesa_read_depth_span_float( GLcontext *ctx, } else { /* no depth buffer */ - BZERO(depth, n * sizeof(GLfloat)); + _mesa_bzero(depth, n * sizeof(GLfloat)); } } @@ -1620,7 +1620,7 @@ _mesa_clear_depth_buffer( GLcontext *ctx ) const GLushort clearValue = (GLushort) (ctx->Depth.Clear * ctx->DepthMax); if ((clearValue & 0xff) == (clearValue >> 8)) { if (clearValue == 0) { - BZERO(ctx->DrawBuffer->DepthBuffer, + _mesa_bzero(ctx->DrawBuffer->DepthBuffer, 2*ctx->DrawBuffer->Width*ctx->DrawBuffer->Height); } else { @@ -1654,7 +1654,7 @@ _mesa_clear_depth_buffer( GLcontext *ctx ) /* >16 bit depth buffer */ const GLuint clearValue = (GLuint) (ctx->Depth.Clear * ctx->DepthMax); if (clearValue == 0) { - BZERO(ctx->DrawBuffer->DepthBuffer, + _mesa_bzero(ctx->DrawBuffer->DepthBuffer, ctx->DrawBuffer->Width*ctx->DrawBuffer->Height*sizeof(GLuint)); } else { diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index a1e26ef..56cb40e 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -1,4 +1,4 @@ -/* $Id: s_span.c,v 1.50 2002/10/24 23:57:24 brianp Exp $ */ +/* $Id: s_span.c,v 1.51 2002/10/30 19:49:30 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -588,7 +588,7 @@ clip_span( GLcontext *ctx, struct sw_span *span ) if (x < xmin) { ASSERT(x + n > xmin); span->writeAll = GL_FALSE; - BZERO(span->array->mask, (xmin - x) * sizeof(GLubyte)); + _mesa_bzero(span->array->mask, (xmin - x) * sizeof(GLubyte)); } /* Clip to right */ @@ -1320,7 +1320,7 @@ _mesa_read_rgba_span( GLcontext *ctx, GLframebuffer *buffer, if (y < 0 || y >= bufHeight || x + (GLint) n < 0 || x >= bufWidth) { /* completely above, below, or right */ /* XXX maybe leave undefined? */ - BZERO(rgba, 4 * n * sizeof(GLchan)); + _mesa_bzero(rgba, 4 * n * sizeof(GLchan)); } else { GLint skip, length; @@ -1373,7 +1373,7 @@ _mesa_read_index_span( GLcontext *ctx, GLframebuffer *buffer, if (y < 0 || y >= bufHeight || x + (GLint) n < 0 || x >= bufWidth) { /* completely above, below, or right */ - BZERO(indx, n * sizeof(GLuint)); + _mesa_bzero(indx, n * sizeof(GLuint)); } else { GLint skip, length; -- 2.7.4