Merge commit 'origin/master' into gallium-0.2

[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 4f324aa60a46a8f632061e240e3e6bfb7a93c518..3260ca34e324a9e5d1418c4943fc68e826a9b5e3 100644 (file)
--- a/src/mesa/swrast/s_masking.h
+++ b/src/mesa/swrast/s_masking.h
@@ -1,10 +1,8 @@
-/* $Id: s_masking.h,v 1.3 2001/03/12 00:48:42 gareth Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  6.5.2
  *
- * Copyright (C) 1999-2001  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,47 +27,16 @@
 #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,
-                      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,
-                       GLuint n, GLint x, GLint y, GLuint index[] );
+_swrast_mask_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
+                       SWspan *span);
 
 
-
-/*
- * 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_ci_span(GLcontext *ctx, struct gl_renderbuffer *rb,
+                     SWspan *span);
 
 #endif