Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline

[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..0596cb3f458b8ad7c4fdff3bae598c13c5170b44 100644 (file)
--- a/src/mesa/swrast/s_masking.h
+++ b/src/mesa/swrast/s_masking.h
@@ -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"),
@@ -31,28 +31,13 @@
 #include "swrast.h"
 
 
-/*
- * 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]);
+                       SWspan *span);
 
 
-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[]);
+                     SWspan *span);
 
 #endif