X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fswrast%2Fs_masking.h;h=03d7ad9b5c03f87d003e1df009910abf06119b0a;hb=d76c204d0564701b4b8b6a2bdda50e2939683e66;hp=3d4aaaa2be11aa9eb2f364f9ca4ba69f55afdd00;hpb=733a4b602bbbfda83ee03b7ae4f3737bbe659034;p=mesa.git

diff --git a/src/mesa/swrast/s_masking.h b/src/mesa/swrast/s_masking.h
index 3d4aaaa2be1..03d7ad9b5c0 100644
--- a/src/mesa/swrast/s_masking.h
+++ b/src/mesa/swrast/s_masking.h
@@ -1,10 +1,7 @@
-/* $Id: s_masking.h,v 1.4 2002/02/02 17:24:11 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
  *
- * Copyright (C) 1999-2002  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"),
@@ -19,9 +16,10 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 
@@ -29,59 +27,15 @@
 #define S_MASKING_H
 
 
-#include "mtypes.h"
-#include "swrast.h"
-
-
-/*
- * Implement glColorMask for a span of RGBA pixels.
- */
-extern void
-_mesa_mask_rgba_span( GLcontext *ctx, const struct sw_span *span,
-                      GLchan rgba[][4] );
-
-
-extern void
-_mesa_mask_rgba_array( GLcontext *ctx, GLuint n, GLint x, GLint y,
-                       GLchan rgba[][4] );
-
-
-/*
- * Implement glColorMask for an array of RGBA pixels.
- */
-extern void
-_mesa_mask_rgba_pixels( GLcontext *ctx,
-                        GLuint n, const GLint x[], const GLint y[],
-                        GLchan rgba[][4], const GLubyte mask[] );
-
-
-
-/*
- * Implement glIndexMask for a span of CI pixels.
- */
-extern void
-_mesa_mask_index_span( GLcontext *ctx, const struct sw_span *span,
-                       GLuint index[] );
+#include "main/glheader.h"
+#include "s_span.h"
 
+struct gl_context;
+struct gl_renderbuffer;
 
 
-/*
- * Implement glIndexMask for a span of CI pixels.
- */
 extern void
-_mesa_mask_index_array( GLcontext *ctx,
-                        GLuint n, GLint x, GLint y, GLuint index[] );
-
-
-
-/*
- * Implement glIndexMask for an array of CI pixels.
- */
-extern void
-_mesa_mask_index_pixels( GLcontext *ctx,
-                         GLuint n, const GLint x[], const GLint y[],
-                         GLuint index[], const GLubyte mask[] );
-
-
+_swrast_mask_rgba_span(struct gl_context *ctx, struct gl_renderbuffer *rb,
+                       SWspan *span, GLuint buf);
 
 #endif