store's to RC/HC didn't work (bug 976287)

[mesa.git] / src / mesa / swrast / s_masking.c

diff --git a/src/mesa/swrast/s_masking.c b/src/mesa/swrast/s_masking.c
index 7e0adc42d3521813d0e40e50513a7f4fa805a235..3badb86007ee129f0d5ec41aa1653ee6e1603057 100644 (file)
--- a/src/mesa/swrast/s_masking.c
+++ b/src/mesa/swrast/s_masking.c
@@ -1,4 +1,3 @@
-/* $Id: s_masking.c,v 1.8 2002/08/07 00:45:07 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -42,7 +41,7 @@
 
 
 void
-_mesa_mask_rgba_span( GLcontext *ctx, const struct sw_span *span,
+_swrast_mask_rgba_span( GLcontext *ctx, const struct sw_span *span,
                      GLchan rgba[][4] )
 {
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@ -68,12 +67,12 @@ _mesa_mask_rgba_span( GLcontext *ctx, const struct sw_span *span,
       (*swrast->Driver.ReadRGBAPixels)(ctx, n, span->array->x, span->array->y,
                                        dest, span->array->mask);
       if (SWRAST_CONTEXT(ctx)->_RasterMask & ALPHABUF_BIT) {
-         _mesa_read_alpha_pixels(ctx, n, span->array->x, span->array->y,
+         _swrast_read_alpha_pixels(ctx, n, span->array->x, span->array->y,
                                  dest, span->array->mask);
       }
    }
    else {
-      _mesa_read_rgba_span(ctx, ctx->DrawBuffer, n, span->x, span->y, dest);
+      _swrast_read_rgba_span(ctx, ctx->DrawBuffer, n, span->x, span->y, dest);
    }
 
 #if CHAN_BITS == 8
@@ -97,7 +96,7 @@ _mesa_mask_rgba_span( GLcontext *ctx, const struct sw_span *span,
  * Apply glColorMask to a span of RGBA pixels.
  */
 void
-_mesa_mask_rgba_array( GLcontext *ctx,
+_swrast_mask_rgba_array( GLcontext *ctx,
                        GLuint n, GLint x, GLint y, GLchan rgba[][4] )
 {
    GLchan dest[MAX_WIDTH][4];
@@ -110,7 +109,7 @@ _mesa_mask_rgba_array( GLcontext *ctx,
    GLuint *rgba32 = (GLuint *) rgba;
    GLuint *dest32 = (GLuint *) dest;
 
-   _mesa_read_rgba_span( ctx, ctx->DrawBuffer, n, x, y, dest );
+   _swrast_read_rgba_span( ctx, ctx->DrawBuffer, n, x, y, dest );
    for (i = 0; i < n; i++) {
       rgba32[i] = (rgba32[i] & srcMask) | (dest32[i] & dstMask);
    }
@@ -122,7 +121,7 @@ _mesa_mask_rgba_array( GLcontext *ctx,
    const GLint bMask = ctx->Color.ColorMask[BCOMP];
    const GLint aMask = ctx->Color.ColorMask[ACOMP];
 
-   _mesa_read_rgba_span( ctx, ctx->DrawBuffer, n, x, y, dest );
+   _swrast_read_rgba_span( ctx, ctx->DrawBuffer, n, x, y, dest );
    for (i = 0; i < n; i++) {
       if (!rMask)  rgba[i][RCOMP] = dest[i][RCOMP];
       if (!gMask)  rgba[i][GCOMP] = dest[i][GCOMP];
@@ -136,7 +135,7 @@ _mesa_mask_rgba_array( GLcontext *ctx,
 
 
 void
-_mesa_mask_index_span( GLcontext *ctx, const struct sw_span *span,
+_swrast_mask_index_span( GLcontext *ctx, const struct sw_span *span,
                        GLuint index[] )
 {
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@ -159,7 +158,7 @@ _mesa_mask_index_span( GLcontext *ctx, const struct sw_span *span,
       }
    }
    else {
-      _mesa_read_index_span(ctx, ctx->DrawBuffer, span->end, span->x, span->y,
+      _swrast_read_index_span(ctx, ctx->DrawBuffer, span->end, span->x, span->y,
                             fbindexes );
 
       for (i = 0; i < span->end; i++) {
@@ -174,14 +173,14 @@ _mesa_mask_index_span( GLcontext *ctx, const struct sw_span *span,
  * Apply glIndexMask to a span of CI pixels.
  */
 void
-_mesa_mask_index_array( GLcontext *ctx,
+_swrast_mask_index_array( GLcontext *ctx,
                         GLuint n, GLint x, GLint y, GLuint index[] )
 {
    GLuint i;
    GLuint fbindexes[MAX_WIDTH];
    GLuint msrc, mdest;
 
-   _mesa_read_index_span( ctx, ctx->DrawBuffer, n, x, y, fbindexes );
+   _swrast_read_index_span( ctx, ctx->DrawBuffer, n, x, y, fbindexes );
 
    msrc = ctx->Color.IndexMask;
    mdest = ~msrc;