1 files changed, 9 insertions, 65 deletions
diff --git a/src/mesa/swrast/s_masking.c b/src/mesa/swrast/s_masking.c
index 65c4e7d01cc..0f2bde1b0a1 100644
--- a/src/mesa/swrast/s_masking.c
+++ b/src/mesa/swrast/s_masking.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  6.5.2
  *
- * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -29,7 +29,6 @@
 
 
 #include "glheader.h"
-#include "enums.h"
 #include "macros.h"
 
 #include "s_context.h"
@@ -37,7 +36,10 @@
 #include "s_span.h"
 
 
-
+/**
+ * Apply the color mask to a span of rgba values.
+ * \param rgba  the array of incoming colors
+ */
 void
 _swrast_mask_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
                        const struct sw_span *span, GLchan rgba[][4])
@@ -83,49 +85,11 @@ _swrast_mask_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
 }
 
 
-/*
- * Apply glColorMask to a span of RGBA pixels.
+/**
+ * Apply the index mask to a span of color index values.
+ * \param index  the array of incoming color indexes
  */
 void
-_swrast_mask_rgba_array(GLcontext *ctx, struct gl_renderbuffer *rb,
-                        GLuint n, GLint x, GLint y, GLchan rgba[][4])
-{
-   GLchan dest[MAX_WIDTH][4];
-   GLuint i;
-
-#if CHAN_BITS == 8
-
-   GLuint srcMask = *((GLuint*)ctx->Color.ColorMask);
-   GLuint dstMask = ~srcMask;
-   GLuint *rgba32 = (GLuint *) rgba;
-   GLuint *dest32 = (GLuint *) dest;
-
-   _swrast_read_rgba_span( ctx, rb, n, x, y, dest );
-   for (i = 0; i < n; i++) {
-      rgba32[i] = (rgba32[i] & srcMask) | (dest32[i] & dstMask);
-   }
-
-#else
-
-   const GLint rMask = ctx->Color.ColorMask[RCOMP];
-   const GLint gMask = ctx->Color.ColorMask[GCOMP];
-   const GLint bMask = ctx->Color.ColorMask[BCOMP];
-   const GLint aMask = ctx->Color.ColorMask[ACOMP];
-
-   _swrast_read_rgba_span( ctx, rb, 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];
-      if (!bMask)  rgba[i][BCOMP] = dest[i][BCOMP];
-      if (!aMask)  rgba[i][ACOMP] = dest[i][ACOMP];
-   }
-
-#endif
-}
-
-
-
-void
 _swrast_mask_ci_span(GLcontext *ctx, struct gl_renderbuffer *rb,
                      const struct sw_span *span, GLuint index[])
 {
@@ -150,23 +114,3 @@ _swrast_mask_ci_span(GLcontext *ctx, struct gl_renderbuffer *rb,
       index[i] = (index[i] & srcMask) | (dest[i] & dstMask);
    }
 }
-
-
-/*
- * Apply glIndexMask to an array of CI pixels.
- */
-void
-_swrast_mask_ci_array(GLcontext *ctx, struct gl_renderbuffer *rb,
-                      GLuint n, GLint x, GLint y, GLuint index[])
-{
-   const GLuint srcMask = ctx->Color.IndexMask;
-   const GLuint dstMask = ~srcMask;
-   GLuint dest[MAX_WIDTH];
-   GLuint i;
-
-   _swrast_read_index_span(ctx, rb, n, x, y, dest);
-
-   for (i=0;i<n;i++) {
-      index[i] = (index[i] & srcMask) | (dest[i] & dstMask);
-   }
-}