swrast: Rename blend_func->swrast_blend_func

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

diff --git a/src/mesa/swrast/s_masking.h b/src/mesa/swrast/s_masking.h
index e2265448f8892b1f049d6c5294eeb162d1ba8286..03d7ad9b5c03f87d003e1df009910abf06119b0a 100644 (file)
--- a/src/mesa/swrast/s_masking.h
+++ b/src/mesa/swrast/s_masking.h
@@ -1,8 +1,7 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
  *
- * 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"),
@@ -17,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.
  */
 
 
@@ -27,32 +27,15 @@
 #define S_MASKING_H
 
 
-#include "mtypes.h"
-#include "swrast.h"
+#include "main/glheader.h"
+#include "s_span.h"
 
+struct gl_context;
+struct gl_renderbuffer;
 
-/*
- * Implement glColorMask for a span of RGBA pixels.
- */
-extern void
-_swrast_mask_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                       const struct sw_span *span, GLchan rgba[][4]);
-
-
-extern void
-_swrast_mask_rgba_array(GLcontext *ctx, struct gl_renderbuffer *rb,
-                        GLuint n, GLint x, GLint y, GLchan rgba[][4]);
-
-
-/*
- * Implement glIndexMask for a span of CI pixels.
- */
-extern void
-_swrast_mask_ci_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                     const struct sw_span *span, GLuint index[]);
 
 extern void
-_swrast_mask_ci_array(GLcontext *ctx, struct gl_renderbuffer *rb,
-                      GLuint n, GLint x, GLint y, GLuint index[]);
+_swrast_mask_rgba_span(struct gl_context *ctx, struct gl_renderbuffer *rb,
+                       SWspan *span, GLuint buf);
 
 #endif