diff options
Diffstat (limited to 'src/mesa/swrast/s_accum.c')
| -rw-r--r-- | src/mesa/swrast/s_accum.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mesa/swrast/s_accum.c b/src/mesa/swrast/s_accum.c index 2af2714bd67..0dfe93bb6bd 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.21 2003/03/01 01:50:25 brianp Exp $ */ +/* $Id: s_accum.c,v 1.22 2003/03/25 02:23:44 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -67,7 +67,7 @@ void -_mesa_alloc_accum_buffer( GLframebuffer *buffer ) +_swrast_alloc_accum_buffer( GLframebuffer *buffer ) { GET_CURRENT_CONTEXT(ctx); GLint n; @@ -130,7 +130,7 @@ static void rescale_accum( GLcontext *ctx ) * Clear the accumulation Buffer. */ void -_mesa_clear_accum_buffer( GLcontext *ctx ) +_swarst_clear_accum_buffer( GLcontext *ctx ) { SWcontext *swrast = SWRAST_CONTEXT(ctx); GLuint buffersize; @@ -325,7 +325,7 @@ _swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value, for (j = 0; j < height; j++) { GLint i, i4; - _mesa_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba); + _swrast_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba); for (i = i4 = 0; i < width; i++, i4+=4) { acc[i4+0] += rgba[i][RCOMP]; acc[i4+1] += rgba[i][GCOMP]; @@ -346,7 +346,7 @@ _swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value, for (j=0;j<height;j++) { GLaccum *acc = ctx->DrawBuffer->Accum + ypos * width4 + xpos * 4; GLint i; - _mesa_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba); + _swrast_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba); for (i=0;i<width;i++) { acc[0] += (GLaccum) ( (GLfloat) rgba[i][RCOMP] * rscale ); acc[1] += (GLaccum) ( (GLfloat) rgba[i][GCOMP] * gscale ); @@ -389,7 +389,7 @@ _swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value, assert(swrast->_IntegerAccumScaler <= 1.0); for (j = 0; j < height; j++) { GLint i, i4; - _mesa_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba); + _swrast_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba); for (i = i4 = 0; i < width; i++, i4 += 4) { acc[i4+0] = rgba[i][RCOMP]; acc[i4+1] = rgba[i][GCOMP]; @@ -412,7 +412,7 @@ _swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value, GLint i, j; for (j = 0; j < height; j++) { GLaccum *acc = ctx->DrawBuffer->Accum + ypos * width4 + xpos * 4; - _mesa_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba); + _swrast_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba); for (i=0;i<width;i++) { #if 0 *acc++ = (GLaccum) ((GLfloat) rgba[i][RCOMP] * rscale + d); @@ -472,13 +472,13 @@ _swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value, rgba[i][ACOMP] = multTable[acc[i4+3]]; } if (colorMask != 0xffffffff) { - _mesa_mask_rgba_array( ctx, width, xpos, ypos, rgba ); + _swrast_mask_rgba_array( ctx, width, xpos, ypos, rgba ); } (*swrast->Driver.WriteRGBASpan)( ctx, width, xpos, ypos, (const GLchan (*)[4])rgba, NULL ); if (ctx->DrawBuffer->UseSoftwareAlphaBuffers && ctx->Color.ColorMask[ACOMP]) { - _mesa_write_alpha_span(ctx, width, xpos, ypos, + _swrast_write_alpha_span(ctx, width, xpos, ypos, (CONST GLchan (*)[4]) rgba, NULL); } ypos++; @@ -507,13 +507,13 @@ _swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value, rgba[i][ACOMP] = CLAMP( a, 0, CHAN_MAX ); } if (colorMask != 0xffffffff) { - _mesa_mask_rgba_array( ctx, width, xpos, ypos, rgba ); + _swrast_mask_rgba_array( ctx, width, xpos, ypos, rgba ); } (*swrast->Driver.WriteRGBASpan)( ctx, width, xpos, ypos, (const GLchan (*)[4])rgba, NULL ); if (ctx->DrawBuffer->UseSoftwareAlphaBuffers && ctx->Color.ColorMask[ACOMP]) { - _mesa_write_alpha_span(ctx, width, xpos, ypos, + _swrast_write_alpha_span(ctx, width, xpos, ypos, (CONST GLchan (*)[4]) rgba, NULL); } ypos++; |